2 files changed, 6 insertions, 0 deletions
diff --git a/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp b/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp
index edb0e5fad2..43eef2f6c0 100644
--- a/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp
+++ b/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp
@@ -82,6 +82,8 @@ bool PNaClABIVerifyFunctions::IsWhitelistedMetadata(unsigned MDKind) {
 //  * a function pointer (with valid argument and return types).
 static bool isValidPointerType(Type *Ty) {
   if (PointerType *PtrTy = dyn_cast<PointerType>(Ty)) {
+    if (PtrTy->getAddressSpace() != 0)
+      return false;
     if (PNaClABITypeChecker::isValidScalarType(PtrTy->getElementType()))
       return true;
     if (FunctionType *FTy = dyn_cast<FunctionType>(PtrTy->getElementType()))
diff --git a/lib/Analysis/NaCl/PNaClABIVerifyModule.cpp b/lib/Analysis/NaCl/PNaClABIVerifyModule.cpp
index cbe7eb833f..364614f9a2 100644
--- a/lib/Analysis/NaCl/PNaClABIVerifyModule.cpp
+++ b/lib/Analysis/NaCl/PNaClABIVerifyModule.cpp
@@ -121,6 +121,10 @@ void PNaClABIVerifyModule::checkGlobalValueCommon(const GlobalValue *GV) {
     Reporter->addError() << GVTypeName << GV->getName() <<
         " has disallowed \"section\" attribute\n";
   }
+  if (GV->getType()->getAddressSpace() != 0) {
+    Reporter->addError() << GVTypeName << GV->getName()
+                         << " has addrspace attribute (disallowed)\n";
+  }
 }
 
 static bool TypeAcceptable(const Type *T,