From f7331b3dd72409e644833ecaf62a0f6db03c97ee Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Tue, 11 Sep 2007 14:10:23 +0000 Subject: Fold the adjust_trampoline intrinsic into init_trampoline. There is now only one trampoline intrinsic. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41841 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/SelectionDAGNodes.h | 7 ++----- include/llvm/Intrinsics.td | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'include/llvm') diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h index d70e3cd..4f44c4f 100644 --- a/include/llvm/CodeGen/SelectionDAGNodes.h +++ b/include/llvm/CodeGen/SelectionDAGNodes.h @@ -540,16 +540,13 @@ namespace ISD { // produces a token chain as output. DEBUG_LOC, - // ADJUST_TRAMP - This corresponds to the adjust_trampoline intrinsic. - // It takes a value as input and returns a value as output. - ADJUST_TRAMP, - // TRAMPOLINE - This corresponds to the init_trampoline intrinsic. // It takes as input a token chain, the pointer to the trampoline, // the pointer to the nested function, the pointer to pass for the // 'nest' parameter, a SRCVALUE for the trampoline and another for // the nested function (allowing targets to access the original - // Function*). It produces a token chain as output. + // Function*). It produces the result of the intrinsic and a token + // chain as output. TRAMPOLINE, // BUILTIN_OP_END - This must be the last enum value in this list. diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td index bb9e9c7..f7b46b2 100644 --- a/include/llvm/Intrinsics.td +++ b/include/llvm/Intrinsics.td @@ -243,11 +243,9 @@ def int_var_annotation : Intrinsic<[llvm_void_ty, llvm_ptr_ty, llvm_ptr_ty, //===------------------------ Trampoline Intrinsics -----------------------===// // -def int_init_trampoline : Intrinsic<[llvm_void_ty, llvm_ptr_ty, llvm_ptr_ty, - llvm_ptr_ty], []>, - GCCBuiltin<"__builtin_init_trampoline">; -def int_adjust_trampoline : Intrinsic<[llvm_ptr_ty, llvm_ptr_ty], [IntrNoMem]>, - GCCBuiltin<"__builtin_adjust_trampoline">; +def int_init_trampoline : Intrinsic<[llvm_ptr_ty, llvm_ptr_ty, llvm_ptr_ty, + llvm_ptr_ty], []>, + GCCBuiltin<"__builtin_init_trampoline">; //===----------------------------------------------------------------------===// // Target-specific intrinsics -- cgit v1.1