commit d9fa5d6a23deead011a206f99d71e96b86543d8d
author Chris Lattner <sabre@nondot.org> Sat Jul 26 22:39:33 2008 +0000
committer Chris Lattner <sabre@nondot.org> Sat Jul 26 22:39:33 2008 +0000
tree 74290834c576d25510ed8327a56b97829f027e68
parent 0f398c44722b9772121dd28815f7d6152571693f

Fix a bug in my previous patch, CGF is not valid for constants outside a function

llvm-svn: 54108

clang/lib/CodeGen/CGExprConstant.cpp

diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index 2aaf297..9efe801 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -627,8 +627,8 @@
   
   llvm::Constant *EmitConversion(llvm::Constant *Src, QualType SrcType, 
                                  QualType DstType) {
-    SrcType = CGF->getContext().getCanonicalType(SrcType);
-    DstType = CGF->getContext().getCanonicalType(DstType);
+    SrcType = CGM.getContext().getCanonicalType(SrcType);
+    DstType = CGM.getContext().getCanonicalType(DstType);
     if (SrcType == DstType) return Src;
     
     // Handle conversions to bool first, they are special: comparisons against 0.