commit 90646732bf1366f9df93fd41a58323cb8f8e0fce
author Mikael Nilsson <mikael.nilsson@arm.com> Wed Dec 12 15:06:16 2018 +0000
committer Mikael Nilsson <mikael.nilsson@arm.com> Wed Dec 12 15:06:16 2018 +0000
tree 4c48633a6081a378faf2e048c37fec998eecb3cf
parent c92fc3c8bca3c1f8ffdd3aa7606061927d64b940

Revert "[OpenCL] Add generic AS to 'this' pointer"

Reverting because the patch broke lldb.

llvm-svn: 348931

clang/lib/CodeGen/CGDeclCXX.cpp

diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp
index 9aa31f1..08ceaa9 100644
--- a/clang/lib/CodeGen/CGDeclCXX.cpp
+++ b/clang/lib/CodeGen/CGDeclCXX.cpp
@@ -26,10 +26,7 @@
 
 static void EmitDeclInit(CodeGenFunction &CGF, const VarDecl &D,
                          ConstantAddress DeclPtr) {
-  assert(
-      (D.hasGlobalStorage() ||
-       (D.hasLocalStorage() && CGF.getContext().getLangOpts().OpenCLCPlusPlus)) &&
-      "VarDecl must have global or local (in the case of OpenCL) storage!");
+  assert(D.hasGlobalStorage() && "VarDecl must have global storage!");
   assert(!D.getType()->isReferenceType() &&
          "Should not call EmitDeclInit on a reference!");