diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
| commit | ef9bd62c68c2c279926e66058bc5a6ef62150432 (patch) | |
| tree | 247f92a4e885f15dbcd37685fa9dbaa7c1db7c67 /include/llvm/CodeGen/ISDOpcodes.h | |
| parent | 5868d5c7576d519a0bba685e7a0471ee306f5eee (diff) | |
| parent | 8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f (diff) | |
Merge commit '8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f'
Conflicts:
include/llvm/CodeGen/ISDOpcodes.h
include/llvm/Target/Target.td
include/llvm/Target/TargetLowering.h
include/llvm/Target/TargetOpcodes.h
lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
lib/Target/Mips/MipsMCInstLower.cpp
utils/TableGen/CodeGenTarget.cpp
Diffstat (limited to 'include/llvm/CodeGen/ISDOpcodes.h')
| -rw-r--r-- | include/llvm/CodeGen/ISDOpcodes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/llvm/CodeGen/ISDOpcodes.h b/include/llvm/CodeGen/ISDOpcodes.h index 2d8181cf6a..95aafb324d 100644 --- a/include/llvm/CodeGen/ISDOpcodes.h +++ b/include/llvm/CodeGen/ISDOpcodes.h @@ -637,6 +637,10 @@ namespace ISD { ATOMIC_LOAD_UMIN, ATOMIC_LOAD_UMAX, + /// This corresponds to the llvm.lifetime.* intrinsics. The first operand + /// is the chain and the second operand is the alloca pointer. + LIFETIME_START, LIFETIME_END, + // @LOCALMOD-BEGIN // NACL_* - Native Client instrinsics. // These correspond to functions in: |