Cast directly and simplify assertions

Author: junlarsen

clang/lib/CodeGen/Address.h

@@ -20,6 +20,7 @@
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
+#include "llvm/Support/Casting.h"
 #include "llvm/Support/MathExtras.h"
 
 namespace clang {
@@ -198,9 +199,7 @@ class Address {
 
   /// Return the type of the pointer value.
   llvm::PointerType *getType() const {
-    auto AS = llvm::cast<llvm::PointerType>(Pointer.getPointer()->getType())
-                  ->getAddressSpace();
-    return llvm::PointerType::get(ElementType->getContext(), AS);
+    return llvm::cast<llvm::PointerType>(Pointer.getPointer()->getType());
   }
 
   /// Return the type of the values stored in this address.

clang/lib/CodeGen/CGDeclCXX.cpp

@@ -345,10 +345,7 @@ void CodeGenFunction::registerGlobalDtorWithLLVM(const VarDecl &VD,
 
 void CodeGenFunction::registerGlobalDtorWithAtExit(llvm::Constant *dtorStub) {
   // extern "C" int atexit(void (*f)(void));
-  assert(dtorStub->getType() ==
-             llvm::PointerType::get(
-                 CGM.getLLVMContext(),
-                 dtorStub->getType()->getPointerAddressSpace()) &&
+  assert(dtorStub->getType()->isPointerTy() &&
          "Argument to atexit has a wrong type.");
 
   llvm::FunctionType *atexitTy =
@@ -372,10 +369,7 @@ CodeGenFunction::unregisterGlobalDtorWithUnAtExit(llvm::Constant *dtorStub) {
   // value is returned.
   //
   // extern "C" int unatexit(void (*f)(void));
-  assert(dtorStub->getType() ==
-             llvm::PointerType::get(
-                 CGM.getLLVMContext(),
-                 dtorStub->getType()->getPointerAddressSpace()) &&
+  assert(dtorStub->getType()->isPointerTy() &&
          "Argument to unatexit has a wrong type.");
 
   llvm::FunctionType *unatexitTy =