[llvm-branch-commits] [llvm-branch] r195115 - Merging r195103:

[Bill Wendling]

Author: void
Date: Tue Nov 19 00:43:35 2013
New Revision: 195115

URL: http://llvm.org/viewvc/llvm-project?rev=195115&view=rev
Log:
Merging r195103:
------------------------------------------------------------------------
r195103 | atrick | 2013-11-18 21:05:43 -0800 (Mon, 18 Nov 2013) | 1 line

Fix patchpoint comments.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/include/llvm/CodeGen/StackMaps.h
    llvm/branches/release_34/lib/CodeGen/SelectionDAG/InstrEmitter.cpp

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 19 00:43:35 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100
+/llvm/trunk:155241,195092-195094,195100,195103

Modified: llvm/branches/release_34/include/llvm/CodeGen/StackMaps.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/include/llvm/CodeGen/StackMaps.h?rev=195115&r1=195114&r2=195115&view=diff
==============================================================================
--- llvm/branches/release_34/include/llvm/CodeGen/StackMaps.h (original)
+++ llvm/branches/release_34/include/llvm/CodeGen/StackMaps.h Tue Nov 19 00:43:35 2013
@@ -25,7 +25,11 @@ class MCExpr;
 /// MI patchpoint operations take the form:
 /// [<def>], <id>, <numBytes>, <target>, <numArgs>, <cc>, ...
 ///
-/// Note that IR/SD patchpoints do not have the <def> or <cc> operands.
+/// IR patchpoint intrinsics do not have the <cc> operand because calling
+/// convention is part of the subclass data.
+///
+/// SD patchpoint nodes do not have a def operand because it is part of the
+/// SDValue.
 ///
 /// Patchpoints following the anyregcc convention are handled specially. For
 /// these, the stack map also records the location of the return value and

Modified: llvm/branches/release_34/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/CodeGen/SelectionDAG/InstrEmitter.cpp?rev=195115&r1=195114&r2=195115&view=diff
==============================================================================
--- llvm/branches/release_34/lib/CodeGen/SelectionDAG/InstrEmitter.cpp (original)
+++ llvm/branches/release_34/lib/CodeGen/SelectionDAG/InstrEmitter.cpp Tue Nov 19 00:43:35 2013
@@ -21,6 +21,7 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/CodeGen/StackMaps.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -732,7 +733,7 @@ EmitMachineNode(SDNode *Node, bool IsClo
 
   // Handle PATCHPOINT specially and then use the generic code.
   if (Opc == TargetOpcode::PATCHPOINT) {
-    unsigned CC = Node->getConstantOperandVal(4);
+    unsigned CC = Node->getConstantOperandVal(PatchPointOpers::CCPos);
     NumDefs = NumResults;
     ScratchRegs = TLI->getScratchRegisters((CallingConv::ID) CC);
   }