[llvm-commits] [llvm-gcc-4.2] r41186 - in /llvm-gcc-4.2/trunk/gcc: llvm-convert.cpp llvm-internal.h

[Duncan Sands]

Author: baldrick
Date: Mon Aug 20 12:10:50 2007
New Revision: 41186

URL: http://llvm.org/viewvc/llvm-project?rev=41186&view=rev
Log:
"FIXME: When merged with mainline, remove this code."
That presumably means now.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-internal.h

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=41186&r1=41185&r2=41186&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Mon Aug 20 12:10:50 2007
@@ -962,10 +962,7 @@
     
   // Constant Expressions
   case INTEGER_CST:
-    if (!DestLoc)
-      Result = TreeConstantToLLVM::ConvertINTEGER_CST(exp);
-    else
-      EmitINTEGER_CST_Aggregate(exp, DestLoc);
+    Result = TreeConstantToLLVM::ConvertINTEGER_CST(exp);
     break;
   case REAL_CST:
     Result = TreeConstantToLLVM::ConvertREAL_CST(exp);
@@ -1994,23 +1991,6 @@
 //                           ... Expressions ...
 //===----------------------------------------------------------------------===//
 
-/// EmitINTEGER_CST_Aggregate - The C++ front-end abuses INTEGER_CST nodes to
-/// represent empty classes.  For now we check that this is the case we handle,
-/// then zero out DestLoc.
-///
-/// FIXME: When merged with mainline, remove this code.  The C++ front-end has
-/// been fixed.
-///
-void TreeToLLVM::EmitINTEGER_CST_Aggregate(tree exp, Value *DestLoc) {
-  tree type = TREE_TYPE(exp);
-#ifndef NDEBUG
-  assert(TREE_CODE(type) == RECORD_TYPE && "Not an empty class!");
-  for (tree F = TYPE_FIELDS(type); F; F = TREE_CHAIN(F))
-    assert(TREE_CODE(F) != FIELD_DECL && "Not an empty struct/class!");
-#endif
-  EmitAggregateZero(DestLoc, type);
-}
-
 /// EmitLoadOfLValue - When an l-value expression is used in a context that
 /// requires an r-value, this method emits the lvalue computation, then loads
 /// the result.

Modified: llvm-gcc-4.2/trunk/gcc/llvm-internal.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-internal.h?rev=41186&r1=41185&r2=41186&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-internal.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-internal.h Mon Aug 20 12:10:50 2007
@@ -454,7 +454,6 @@
   Value *EmitSWITCH_EXPR(tree_node *exp);
 
   // Expressions.
-  void   EmitINTEGER_CST_Aggregate(tree_node *exp, Value *DestLoc);
   Value *EmitLoadOfLValue(tree_node *exp, Value *DestLoc);
   Value *EmitOBJ_TYPE_REF(tree_node *exp, Value *DestLoc);
   Value *EmitADDR_EXPR(tree_node *exp);