Add CodeGen support for AddrLabelExpr in initializers.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54837 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index ec6a75f3569bfb3aa6bc108ea76f71748b352e83..ea60cbb1b048679deede926905e32a8aad7d9286 100644 (file)
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -378,6 +378,14 @@ public:
     return EmitSizeAlignOf(E->getArgumentType(), E->getType(), E->isSizeOf());
   }
 
+  llvm::Constant *VisitAddrLabelExpr(const AddrLabelExpr *E) {
+    assert(CGF && "Invalid address of label expression outside function.");
+    llvm::Constant *C = 
+      llvm::ConstantInt::get(llvm::Type::Int32Ty,
+                             CGF->GetIDForAddrOfLabel(E->getLabel()));
+    return llvm::ConstantExpr::getIntToPtr(C, ConvertType(E->getType()));
+  }
+
   // Unary operators
   llvm::Constant *VisitUnaryPlus(const UnaryOperator *E) {
     return Visit(E->getSubExpr());

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index e408e9ff9ed3cbf9d73ba284a9d298fb3412d72e..4eb906269aeaa1eda11997eebd854475cc003e6d 100644 (file)
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -123,10 +123,11 @@ public:
     return EmitSizeAlignOf(E->getArgumentType(), E->getType(), E->isSizeOf());
   }
   Value *VisitAddrLabelExpr(const AddrLabelExpr *E) {
-    Value *V = llvm::ConstantInt::get(llvm::Type::Int32Ty,
-                                      CGF.GetIDForAddrOfLabel(E->getLabel()));
-    return Builder.CreateIntToPtr(V, 
-                                  llvm::PointerType::getUnqual(llvm::Type::Int8Ty));
+    llvm::Value *V = 
+      llvm::ConstantInt::get(llvm::Type::Int32Ty,
+                             CGF.GetIDForAddrOfLabel(E->getLabel()));
+    
+    return Builder.CreateIntToPtr(V, ConvertType(E->getType()));
   }
     
   // l-values.