PlaceSafepoints: modernize gc.result.* -> gc.result

[reames]

Code change LGTM, test should be moved to the new PlaceSafepoints directory if still relevant.

Sorry for the churn here. I really wasn't expecting anyone to start trying to use this yet. :)

llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp

static Value *ReplaceWithStatepoint(const CallSite &CS, /* to replace */
   // Handle the return value of the original call - update all uses to use a
   // gc_result hanging off the statepoint node we just inserted
 
   // Only add the gc_result iff there is actually a used result
   if (!CS.getType()->isVoidTy() && !CS.getInstruction()->use_empty()) {
     Instruction *gc_result = nullptr;
     std::vector<Type *> types;     // one per 'any' type
     types.push_back(CS.getType()); // result type
-    auto get_gc_result_id = [&](Type &Ty) {
-      if (Ty.isIntegerTy()) {
-        return Intrinsic::experimental_gc_result_int;
-      } else if (Ty.isFloatingPointTy()) {
-        return Intrinsic::experimental_gc_result_float;
-      } else if (Ty.isPointerTy()) {
-        return Intrinsic::experimental_gc_result_ptr;
-      } else {
-        llvm_unreachable("non java type encountered");
-      }
-    };
-    Intrinsic::ID Id = get_gc_result_id(*CS.getType());
+    Intrinsic::ID Id = Intrinsic::experimental_gc_result;
     Value *gc_result_func = Intrinsic::getDeclaration(M, Id, types);
 
     std::vector<Value *> args;
     args.push_back(token);
     gc_result = Builder.CreateCall(
         gc_result_func, args,
         CS.getInstruction()->hasName() ? CS.getInstruction()->getName() : "");
 
     cast<CallInst>(gc_result)->setAttributes(return_attributes);
     return gc_result;
   } else {
     // No return value for the call.
     return nullptr;
   }
 }

llvm/trunk/test/Transforms/PlaceSafepoints/basic.ll

 
 ; Do we turn a call into it's own statepoint
 define void @test_simple_call() gc "statepoint-example" {
 ; CHECK-LABEL: test_simple_call
 entry:
   br label %other
 other:
 ; CHECK-LABEL: other
-; CHECK: statepoint 
+; CHECK: statepoint
+; CHECK-NOT: gc.result
   call void @foo()
   ret void
 }
 
+declare zeroext i1 @i1_return_i1(i1)
+
+define i1 @test_call_with_result() gc "statepoint-example" {
+; CHECK-LABEL: test_call_with_result
+; This is checking that a statepoint_poll + statepoint + result is
+; inserted for a function that takes 1 argument.
+; CHECK: gc.statepoint.p0f_isVoidf
+; CHECK: gc.statepoint.p0f_i1i1f
+; CHECK: (i1 (i1)* @i1_return_i1, i32 1, i32 0, i1 false, i32 0)
+; CHECK: gc.result.i1
+entry:
+  %call1 = tail call i1 (i1)* @i1_return_i1(i1 false)
+  ret i1 %call1
+}
 
 ; This function is inlined when inserting a poll.  To avoid recursive 
 ; issues, make sure we don't place safepoints in it.
 declare void @do_safepoint()
 define void @gc.safepoint_poll() {
 ; CHECK-LABEL: gc.safepoint_poll
 ; CHECK-LABEL: entry
 ; CHECK-NEXT: do_safepoint
 ; CHECK-NEXT: ret void 
 entry:
   call void @do_safepoint()
   ret void
 }