Commit 9afea597 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r195103: 

------------------------------------------------------------------------
r195103 | atrick | 2013-11-18 21:05:43 -0800 (Mon, 18 Nov 2013) | 1 line

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

llvm-svn: 195115
parent 23a96ccc

llvm/include/llvm/CodeGen/StackMaps.h

+5 −1
Original line number Diff line number Diff line
@@ -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

llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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 IsClone, bool IsCloned, 


  // 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);

  }