2 files changed, 13 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index ec6a75f3569..ea60cbb1b04 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/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/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index e408e9ff9ed..4eb906269ae 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/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.