[cfe-commits] r62948 - in /cfe/trunk: lib/AST/ExprConstant.cpp lib/CodeGen/CGExprConstant.cpp test/CodeGen/const-label-addr.c

[Eli Friedman]

Author: efriedma
Date: Sat Jan 24 19:21:06 2009
New Revision: 62948

URL: http://llvm.org/viewvc/llvm-project?rev=62948&view=rev
Log:
Fix the address of a label to be properly considered and emitted as a
constant.


Added:
    cfe/trunk/test/CodeGen/const-label-addr.c
Modified:
    cfe/trunk/lib/AST/ExprConstant.cpp
    cfe/trunk/lib/CodeGen/CGExprConstant.cpp

Modified: cfe/trunk/lib/AST/ExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=62948&r1=62947&r2=62948&view=diff

==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Sat Jan 24 19:21:06 2009
@@ -215,6 +215,8 @@
   APValue VisitUnaryOperator(const UnaryOperator *E);
   APValue VisitObjCStringLiteral(ObjCStringLiteral *E)
       { return APValue(E, 0); }
+  APValue VisitAddrLabelExpr(AddrLabelExpr *E)
+      { return APValue(E, 0); }
   APValue VisitConditionalOperator(ConditionalOperator *E);
 };
 } // end anonymous namespace

Modified: cfe/trunk/lib/CodeGen/CGExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprConstant.cpp?rev=62948&r1=62947&r2=62948&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprConstant.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprConstant.cpp Sat Jan 24 19:21:06 2009
@@ -619,6 +619,12 @@
       
       return CGM.GetAddrOfConstantCString(Str, ".tmp");
     }
+    case Expr::AddrLabelExprClass: {
+      assert(CGF && "Invalid address of label expression outside function.");
+      unsigned id = CGF->GetIDForAddrOfLabel(cast<AddrLabelExpr>(E)->getLabel());
+      llvm::Constant *C = llvm::ConstantInt::get(llvm::Type::Int32Ty, id);
+      return llvm::ConstantExpr::getIntToPtr(C, ConvertType(E->getType()));
+    }
     }
     CGM.ErrorUnsupported(E, "constant l-value expression");
     llvm::Type *Ty = llvm::PointerType::getUnqual(ConvertType(E->getType()));

Added: cfe/trunk/test/CodeGen/const-label-addr.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/const-label-addr.c?rev=62948&view=auto

==============================================================================
--- cfe/trunk/test/CodeGen/const-label-addr.c (added)
+++ cfe/trunk/test/CodeGen/const-label-addr.c Sat Jan 24 19:21:06 2009
@@ -0,0 +1,4 @@
+// RUN: clang %s -emit-llvm -o %t
+int a() {
+A:;static void* a = &&A;
+}