[llvm-commits] [llvm-gcc-4.2] r119294 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Dale Johannesen]

Author: johannes
Date: Mon Nov 15 18:24:33 2010
New Revision: 119294

URL: http://llvm.org/viewvc/llvm-project?rev=119294&view=rev
Log:
Revert 119292 which broke the build.


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

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=119294&r1=119293&r2=119294&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Mon Nov 15 18:24:33 2010
@@ -2450,7 +2450,7 @@
 
 static bool canEmitLocalRegisterVariable(tree exp) {
   // Only variables can be marked as 'register'.
-  if (TREE_CODE(exp) != VAR_DECL || !DECL_HARD_REGISTER(exp))
+  if (TREE_CODE(exp) != VAR_DECL || !DECL_REGISTER(exp))
     return false;
 
   // Global register variables are not accepted here.
@@ -2467,7 +2467,7 @@
 
 static bool canEmitGlobalRegisterVariable(tree exp) {
   // Only variables can be marked as 'register'.
-  if (TREE_CODE(exp) != VAR_DECL || !DECL_HARD_REGISTER(exp))
+  if (TREE_CODE(exp) != VAR_DECL || !DECL_REGISTER(exp))
     return false;
 
   // Local register variables are not accepted here.
@@ -4776,7 +4776,6 @@
   unsigned NumInputs = list_length(ASM_INPUTS(exp));
   unsigned NumOutputs = list_length(ASM_OUTPUTS(exp));
   unsigned NumInOut = 0;
-  bool isAsmBlock = ASM_ASM_BLOCK(exp);
 
   // Look for multiple alternative constraints: multiple alternatives separated
   // by commas.
@@ -5157,7 +5156,7 @@
   }
 
   Value *Asm = InlineAsm::get(FTy, NewAsmStr, ConstraintStr,
-                              HasSideEffects, isAsmBlock);
+                              HasSideEffects, ASM_ASM_BLOCK(exp));
   CallInst *CV = Builder.CreateCall(Asm, CallOps.begin(), CallOps.end(),
                                     CallResultTypes.empty() ? "" : "asmtmp");
   CV->setDoesNotThrow();