[llvm-branch-commits] [llvm-branch] r100763 - in /llvm/branches/ggreif/CallInst-operands: ./ lib/Target/CBackend/CBackend.cpp

[Gabor Greif]

Author: ggreif
Date: Thu Apr  8 08:52:39 2010
New Revision: 100763

URL: http://llvm.org/viewvc/llvm-project?rev=100763&view=rev
Log:
pull from trunk

Modified:
    llvm/branches/ggreif/CallInst-operands/   (props changed)
    llvm/branches/ggreif/CallInst-operands/lib/Target/CBackend/CBackend.cpp

Propchange: llvm/branches/ggreif/CallInst-operands/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr  8 08:52:39 2010
@@ -1,3 +1,3 @@
 /llvm/branches/ggreif/InvokeInst-operands:98645-99398
 /llvm/branches/ggreif/const-CallSite:99517-100006
-/llvm/trunk:100544,100758,100760
+/llvm/trunk:100544,100758,100760,100762

Modified: llvm/branches/ggreif/CallInst-operands/lib/Target/CBackend/CBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/CallInst-operands/lib/Target/CBackend/CBackend.cpp?rev=100763&r1=100762&r2=100763&view=diff
==============================================================================
--- llvm/branches/ggreif/CallInst-operands/lib/Target/CBackend/CBackend.cpp (original)
+++ llvm/branches/ggreif/CallInst-operands/lib/Target/CBackend/CBackend.cpp Thu Apr  8 08:52:39 2010
@@ -2858,7 +2858,7 @@
 }
 
 void CWriter::visitCallInst(CallInst &I) {
-  if (isa<InlineAsm>(I.getOperand(0)))
+  if (isa<InlineAsm>(I.getCalledValue()))
     return visitInlineAsm(I);
 
   bool WroteCallee = false;
@@ -3165,7 +3165,7 @@
 //TODO: assumptions about what consume arguments from the call are likely wrong
 //      handle communitivity
 void CWriter::visitInlineAsm(CallInst &CI) {
-  InlineAsm* as = cast<InlineAsm>(CI.getOperand(0));
+  InlineAsm* as = cast<InlineAsm>(CI.getCalledValue());
   std::vector<InlineAsm::ConstraintInfo> Constraints = as->ParseConstraints();
   
   std::vector<std::pair<Value*, int> > ResultVals;