Skip to content

Commit 894a0dd

Browse files
committed
Revert "[KeyIntsr][Clang] Builtins atoms (#134651)"
This reverts commit b14799e. Breaks downstream bots.
1 parent 7e4bdb4 commit 894a0dd

File tree

2 files changed

+10
-110
lines changed

2 files changed

+10
-110
lines changed

clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "clang/Basic/TargetInfo.h"
3030
#include "clang/Frontend/FrontendDiagnostic.h"
3131
#include "llvm/IR/InlineAsm.h"
32-
#include "llvm/IR/Instruction.h"
3332
#include "llvm/IR/Intrinsics.h"
3433
#include "llvm/IR/IntrinsicsX86.h"
3534
#include "llvm/IR/MatrixBuilder.h"
@@ -4191,7 +4190,6 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
41914190
Matrix, Dst.emitRawPointer(*this),
41924191
Align(Dst.getAlignment().getQuantity()), Stride, IsVolatile,
41934192
MatrixTy->getNumRows(), MatrixTy->getNumColumns());
4194-
addInstToNewSourceAtom(cast<Instruction>(Result), Matrix);
41954193
return RValue::get(Result);
41964194
}
41974195

@@ -4352,8 +4350,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
43524350
Value *SizeVal = EmitScalarExpr(E->getArg(1));
43534351
EmitNonNullArgCheck(Dest, E->getArg(0)->getType(),
43544352
E->getArg(0)->getExprLoc(), FD, 0);
4355-
auto *I = Builder.CreateMemSet(Dest, Builder.getInt8(0), SizeVal, false);
4356-
addInstToNewSourceAtom(I, nullptr);
4353+
Builder.CreateMemSet(Dest, Builder.getInt8(0), SizeVal, false);
43574354
return RValue::get(nullptr);
43584355
}
43594356

@@ -4368,8 +4365,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
43684365
EmitNonNullArgCheck(RValue::get(Dest.emitRawPointer(*this)),
43694366
E->getArg(1)->getType(), E->getArg(1)->getExprLoc(), FD,
43704367
0);
4371-
auto *I = Builder.CreateMemMove(Dest, Src, SizeVal, false);
4372-
addInstToNewSourceAtom(I, nullptr);
4368+
Builder.CreateMemMove(Dest, Src, SizeVal, false);
43734369
return RValue::get(nullptr);
43744370
}
43754371

@@ -4382,8 +4378,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
43824378
Value *SizeVal = EmitScalarExpr(E->getArg(2));
43834379
EmitArgCheck(TCK_Store, Dest, E->getArg(0), 0);
43844380
EmitArgCheck(TCK_Load, Src, E->getArg(1), 1);
4385-
auto *I = Builder.CreateMemCpy(Dest, Src, SizeVal, false);
4386-
addInstToNewSourceAtom(I, nullptr);
4381+
Builder.CreateMemCpy(Dest, Src, SizeVal, false);
43874382
if (BuiltinID == Builtin::BImempcpy ||
43884383
BuiltinID == Builtin::BI__builtin_mempcpy)
43894384
return RValue::get(Builder.CreateInBoundsGEP(
@@ -4399,8 +4394,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
43994394
E->getArg(2)->EvaluateKnownConstInt(getContext()).getZExtValue();
44004395
EmitArgCheck(TCK_Store, Dest, E->getArg(0), 0);
44014396
EmitArgCheck(TCK_Load, Src, E->getArg(1), 1);
4402-
auto *I = Builder.CreateMemCpyInline(Dest, Src, Size);
4403-
addInstToNewSourceAtom(I, nullptr);
4397+
Builder.CreateMemCpyInline(Dest, Src, Size);
44044398
return RValue::get(nullptr);
44054399
}
44064400

@@ -4421,8 +4415,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
44214415
Address Dest = EmitPointerWithAlignment(E->getArg(0));
44224416
Address Src = EmitPointerWithAlignment(E->getArg(1));
44234417
Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
4424-
auto *I = Builder.CreateMemCpy(Dest, Src, SizeVal, false);
4425-
addInstToNewSourceAtom(I, nullptr);
4418+
Builder.CreateMemCpy(Dest, Src, SizeVal, false);
44264419
return RValue::get(Dest, *this);
44274420
}
44284421

@@ -4448,8 +4441,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
44484441
Address Dest = EmitPointerWithAlignment(E->getArg(0));
44494442
Address Src = EmitPointerWithAlignment(E->getArg(1));
44504443
Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
4451-
auto *I = Builder.CreateMemMove(Dest, Src, SizeVal, false);
4452-
addInstToNewSourceAtom(I, nullptr);
4444+
Builder.CreateMemMove(Dest, Src, SizeVal, false);
44534445
return RValue::get(Dest, *this);
44544446
}
44554447

@@ -4469,8 +4461,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
44694461
.getQuantity()));
44704462
EmitArgCheck(TCK_Store, Dest, E->getArg(0), 0);
44714463
EmitArgCheck(TCK_Load, Src, E->getArg(1), 1);
4472-
auto *I = Builder.CreateMemMove(Dest, Src, SizeVal, false);
4473-
addInstToNewSourceAtom(I, nullptr);
4464+
Builder.CreateMemMove(Dest, Src, SizeVal, false);
44744465
return RValue::get(Dest, *this);
44754466
}
44764467
case Builtin::BImemset:
@@ -4481,8 +4472,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
44814472
Value *SizeVal = EmitScalarExpr(E->getArg(2));
44824473
EmitNonNullArgCheck(Dest, E->getArg(0)->getType(),
44834474
E->getArg(0)->getExprLoc(), FD, 0);
4484-
auto *I = Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
4485-
addInstToNewSourceAtom(I, ByteVal);
4475+
Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
44864476
return RValue::get(Dest, *this);
44874477
}
44884478
case Builtin::BI__builtin_memset_inline: {
@@ -4494,8 +4484,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
44944484
EmitNonNullArgCheck(RValue::get(Dest.emitRawPointer(*this)),
44954485
E->getArg(0)->getType(), E->getArg(0)->getExprLoc(), FD,
44964486
0);
4497-
auto *I = Builder.CreateMemSetInline(Dest, ByteVal, Size);
4498-
addInstToNewSourceAtom(I, nullptr);
4487+
Builder.CreateMemSetInline(Dest, ByteVal, Size);
44994488
return RValue::get(nullptr);
45004489
}
45014490
case Builtin::BI__builtin___memset_chk: {
@@ -4512,8 +4501,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
45124501
Value *ByteVal = Builder.CreateTrunc(EmitScalarExpr(E->getArg(1)),
45134502
Builder.getInt8Ty());
45144503
Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
4515-
auto *I = Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
4516-
addInstToNewSourceAtom(I, nullptr);
4504+
Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
45174505
return RValue::get(Dest, *this);
45184506
}
45194507
case Builtin::BI__builtin_wmemchr: {

clang/test/DebugInfo/KeyInstructions/builtin.c

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)