fixup! do not strip _

Created using spr 1.3.8-beta.1

Author: melver

llvm/lib/Transforms/Instrumentation/AllocToken.cpp

@@ -438,10 +438,8 @@ FunctionCallee AllocToken::getTokenAllocFunction(const CallBase &CB,
     TokenAllocName += utostr(TokenID) + "_";
   else
     NewParams.push_back(IntPtrTy); // token ID
+  TokenAllocName += Callee->getName();
   FunctionType *NewFTy = FunctionType::get(RetTy, NewParams, false);
-  // Remove leading '_' - we add our own.
-  StringRef No_ = Callee->getName().drop_while([](char C) { return C == '_'; });
-  TokenAllocName += No_;
   FunctionCallee TokenAlloc = Mod.getOrInsertFunction(TokenAllocName, NewFTy);
   if (Function *F = dyn_cast<Function>(TokenAlloc.getCallee()))
     F->copyAttributesFrom(Callee); // preserve attrs

llvm/test/Instrumentation/AllocToken/basic.ll

@@ -35,8 +35,8 @@ define ptr @test_cpp_operators() sanitize_alloc_token {
 ; CHECK-LABEL: define ptr @test_cpp_operators(
 ; CHECK-SAME: ) #[[ATTR5]] {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
-; CHECK-NEXT:    [[TMP0:%.*]] = call ptr @__alloc_token_Znwm(i64 32, i64 3)
-; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @__alloc_token_Znam(i64 64, i64 4)
+; CHECK-NEXT:    [[TMP0:%.*]] = call ptr @__alloc_token__Znwm(i64 32, i64 3)
+; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @__alloc_token__Znam(i64 64, i64 4)
 ; CHECK-NEXT:    ret ptr [[TMP0]]
 ;
 entry:

llvm/test/Instrumentation/AllocToken/basic32.ll

@@ -23,7 +23,7 @@ define ptr @test_cpp_operators() sanitize_alloc_token {
 ; CHECK-LABEL: define ptr @test_cpp_operators(
 ; CHECK-SAME: ) #[[ATTR2]] {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
-; CHECK-NEXT:    [[TMP0:%.*]] = call ptr @__alloc_token_Znwm(i32 32, i32 1)
+; CHECK-NEXT:    [[TMP0:%.*]] = call ptr @__alloc_token__Znwm(i32 32, i32 1)
 ; CHECK-NEXT:    ret ptr [[TMP0]]
 ;
 entry:

llvm/test/Instrumentation/AllocToken/extralibfuncs.ll

@@ -12,7 +12,7 @@ define ptr @test_extra_libfuncs() sanitize_alloc_token {
 ; CHECK-LABEL: define ptr @test_extra_libfuncs(
 ; CHECK-SAME: ) #[[ATTR1:[0-9]+]] {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
-; CHECK-NEXT:    [[TMP0:%.*]] = call { ptr, i64 } @__alloc_token_size_returning_new(i64 10, i64 6985720287680550851), !alloc_token [[META0:![0-9]+]]
+; CHECK-NEXT:    [[TMP0:%.*]] = call { ptr, i64 } @__alloc_token___size_returning_new(i64 10, i64 6985720287680550851), !alloc_token [[META0:![0-9]+]]
 ; CHECK-NEXT:    [[PTR1:%.*]] = extractvalue { ptr, i64 } [[TMP0]], 0
 ; CHECK-NEXT:    ret ptr [[PTR1]]
 ;
@@ -29,8 +29,8 @@ define ptr @test_replaceable_new() sanitize_alloc_token {
 ; CHECK-LABEL: define ptr @test_replaceable_new(
 ; CHECK-SAME: ) #[[ATTR1]] {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
-; CHECK-NEXT:    [[TMP0:%.*]] = call ptr @__alloc_token_Znwm(i64 32, i64 6985720287680550851), !alloc_token [[META0]]
-; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @__alloc_token_Znam(i64 64, i64 6985720287680550851), !alloc_token [[META0]]
+; CHECK-NEXT:    [[TMP0:%.*]] = call ptr @__alloc_token__Znwm(i64 32, i64 6985720287680550851), !alloc_token [[META0]]
+; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @__alloc_token__Znam(i64 64, i64 6985720287680550851), !alloc_token [[META0]]
 ; CHECK-NEXT:    ret ptr [[TMP0]]
 ;
 entry:

llvm/test/Instrumentation/AllocToken/fast.ll

@@ -32,8 +32,8 @@ define ptr @test_cpp_operators() sanitize_alloc_token {
 ; CHECK-LABEL: define ptr @test_cpp_operators(
 ; CHECK-SAME: ) #[[ATTR4]] {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
-; CHECK-NEXT:    [[PTR1:%.*]] = call ptr @__alloc_token_0_Znwm(i64 32)
-; CHECK-NEXT:    [[PTR2:%.*]] = call ptr @__alloc_token_1_Znam(i64 64)
+; CHECK-NEXT:    [[PTR1:%.*]] = call ptr @__alloc_token_0__Znwm(i64 32)
+; CHECK-NEXT:    [[PTR2:%.*]] = call ptr @__alloc_token_1__Znam(i64 64)
 ; CHECK-NEXT:    ret ptr [[PTR1]]
 ;
 entry:

llvm/test/Instrumentation/AllocToken/invoke.ll

@@ -32,7 +32,7 @@ define ptr @test_invoke_operator_new() sanitize_alloc_token personality ptr @__g
 ; CHECK-LABEL: define ptr @test_invoke_operator_new(
 ; CHECK-SAME: ) #[[ATTR0]] personality ptr @__gxx_personality_v0 {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
-; CHECK-NEXT:    [[TMP0:%.*]] = invoke ptr @__alloc_token_Znwm(i64 32, i64 1)
+; CHECK-NEXT:    [[TMP0:%.*]] = invoke ptr @__alloc_token__Znwm(i64 32, i64 1)
 ; CHECK-NEXT:            to label %[[NORMAL:.*]] unwind label %[[CLEANUP:.*]]
 ; CHECK:       [[NORMAL]]:
 ; CHECK-NEXT:    ret ptr [[TMP0]]
@@ -60,7 +60,7 @@ define ptr @test_complex_invoke_flow() sanitize_alloc_token personality ptr @__g
 ; CHECK-NEXT:    [[TMP0:%.*]] = invoke ptr @__alloc_token_malloc(i64 16, i64 2)
 ; CHECK-NEXT:            to label %[[FIRST_OK:.*]] unwind label %[[CLEANUP1:.*]]
 ; CHECK:       [[FIRST_OK]]:
-; CHECK-NEXT:    [[TMP1:%.*]] = invoke ptr @__alloc_token_Znwm(i64 32, i64 3)
+; CHECK-NEXT:    [[TMP1:%.*]] = invoke ptr @__alloc_token__Znwm(i64 32, i64 3)
 ; CHECK-NEXT:            to label %[[SECOND_OK:.*]] unwind label %[[CLEANUP2:.*]]
 ; CHECK:       [[SECOND_OK]]:
 ; CHECK-NEXT:    ret ptr [[TMP0]]