https://github.com/beetrees updated
https://github.com/llvm/llvm-project/pull/84559
>From fa68bd6294b9cc138a30a57d0b1bb563c3471592 Mon Sep 17 00:00:00 2001
From: beetrees <b...@beetr.ee>
Date: Fri, 8 Mar 2024 17:20:14 +0000
Subject: [PATCH 1/2] Fix silent truncation of inline ASM `srcloc` cookie when
going through a `DiagnosticInfoSrcMgr`
---
llvm/docs/LangRef.rst | 2 +-
llvm/include/llvm/IR/DiagnosticInfo.h | 6 +++---
llvm/lib/CodeGen/MachineModuleInfo.cpp | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/llvm/docs/LangRef.rst b/llvm/docs/LangRef.rst
index a7b77d6f776a7..d3015d73e7660 100644
--- a/llvm/docs/LangRef.rst
+++ b/llvm/docs/LangRef.rst
@@ -5594,7 +5594,7 @@ it. For example:
call void asm sideeffect "something bad", ""(), !srcloc !42
...
- !42 = !{ i32 1234567 }
+ !42 = !{ i64 1234567 }
It is up to the front-end to make sense of the magic numbers it places
in the IR. If the MDNode contains multiple constants, the code generator
diff --git a/llvm/include/llvm/IR/DiagnosticInfo.h
b/llvm/include/llvm/IR/DiagnosticInfo.h
index 628445fe9fb2c..42373835731d9 100644
--- a/llvm/include/llvm/IR/DiagnosticInfo.h
+++ b/llvm/include/llvm/IR/DiagnosticInfo.h
@@ -1076,11 +1076,11 @@ class DiagnosticInfoSrcMgr : public DiagnosticInfo {
// For inlineasm !srcloc translation.
bool InlineAsmDiag;
- unsigned LocCookie;
+ uint64_t LocCookie;
public:
DiagnosticInfoSrcMgr(const SMDiagnostic &Diagnostic, StringRef ModName,
- bool InlineAsmDiag = true, unsigned LocCookie = 0)
+ bool InlineAsmDiag = true, uint64_t LocCookie = 0)
: DiagnosticInfo(DK_SrcMgr, getDiagnosticSeverity(Diagnostic.getKind())),
Diagnostic(Diagnostic), ModName(ModName), InlineAsmDiag(InlineAsmDiag),
LocCookie(LocCookie) {}
@@ -1088,7 +1088,7 @@ class DiagnosticInfoSrcMgr : public DiagnosticInfo {
StringRef getModuleName() const { return ModName; }
bool isInlineAsmDiag() const { return InlineAsmDiag; }
const SMDiagnostic &getSMDiag() const { return Diagnostic; }
- unsigned getLocCookie() const { return LocCookie; }
+ uint64_t getLocCookie() const { return LocCookie; }
void print(DiagnosticPrinter &DP) const override;
static bool classof(const DiagnosticInfo *DI) {
diff --git a/llvm/lib/CodeGen/MachineModuleInfo.cpp
b/llvm/lib/CodeGen/MachineModuleInfo.cpp
index f24288bb69de0..2f9f50f132f82 100644
--- a/llvm/lib/CodeGen/MachineModuleInfo.cpp
+++ b/llvm/lib/CodeGen/MachineModuleInfo.cpp
@@ -185,7 +185,7 @@ INITIALIZE_PASS(MachineModuleInfoWrapperPass,
"machinemoduleinfo",
"Machine Module Information", false, false)
char MachineModuleInfoWrapperPass::ID = 0;
-static unsigned getLocCookie(const SMDiagnostic &SMD, const SourceMgr &SrcMgr,
+static uint64_t getLocCookie(const SMDiagnostic &SMD, const SourceMgr &SrcMgr,
std::vector<const MDNode *> &LocInfos) {
// Look up a LocInfo for the buffer this diagnostic is coming from.
unsigned BufNum = SrcMgr.FindBufferContainingLoc(SMD.getLoc());
@@ -195,7 +195,7 @@ static unsigned getLocCookie(const SMDiagnostic &SMD, const
SourceMgr &SrcMgr,
// If the inline asm had metadata associated with it, pull out a location
// cookie corresponding to which line the error occurred on.
- unsigned LocCookie = 0;
+ uint64_t LocCookie = 0;
if (LocInfo) {
unsigned ErrorLine = SMD.getLineNo() - 1;
if (ErrorLine >= LocInfo->getNumOperands())
@@ -219,7 +219,7 @@ bool MachineModuleInfoWrapperPass::doInitialization(Module
&M) {
[&Ctx, &M](const SMDiagnostic &SMD, bool IsInlineAsm,
const SourceMgr &SrcMgr,
std::vector<const MDNode *> &LocInfos) {
- unsigned LocCookie = 0;
+ uint64_t LocCookie = 0;
if (IsInlineAsm)
LocCookie = getLocCookie(SMD, SrcMgr, LocInfos);
Ctx.diagnose(
>From 601c20a8ceef445c1fe40928ec975b29a9b33e75 Mon Sep 17 00:00:00 2001
From: beetrees <b...@beetr.ee>
Date: Thu, 13 Jun 2024 16:03:18 +0100
Subject: [PATCH 2/2] Widen `LocCookie` for `DiagnosticInfoDontCall` to
`uint64_t` to match `DiagnosticInfoSrcMgr`
---
clang/lib/CodeGen/CGCall.cpp | 2 +-
clang/test/CodeGen/attr-error.c | 2 +-
clang/test/CodeGen/attr-warning.c | 2 +-
llvm/include/llvm/IR/DiagnosticInfo.h | 6 +++---
llvm/lib/IR/DiagnosticInfo.cpp | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 13f68237b464d..3dc587dce012a 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -5718,7 +5718,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo
&CallInfo,
// Add metadata if calling an __attribute__((error(""))) or warning fn.
if (TargetDecl && TargetDecl->hasAttr<ErrorAttr>()) {
llvm::ConstantInt *Line =
- llvm::ConstantInt::get(Int32Ty, Loc.getRawEncoding());
+ llvm::ConstantInt::get(Int64Ty, Loc.getRawEncoding());
llvm::ConstantAsMetadata *MD = llvm::ConstantAsMetadata::get(Line);
llvm::MDTuple *MDT = llvm::MDNode::get(getLLVMContext(), {MD});
CI->setMetadata("srcloc", MDT);
diff --git a/clang/test/CodeGen/attr-error.c b/clang/test/CodeGen/attr-error.c
index a1b63ab9fa9e5..ce0e00c3c465b 100644
--- a/clang/test/CodeGen/attr-error.c
+++ b/clang/test/CodeGen/attr-error.c
@@ -8,4 +8,4 @@ void bar(void) {
// CHECK: call void @foo(), !srcloc [[SRCLOC:![0-9]+]]
// CHECK: declare{{.*}} void @foo() [[ATTR:#[0-9]+]]
// CHECK: attributes [[ATTR]] = {{{.*}}"dontcall-error"="oh no"
-// CHECK: [[SRCLOC]] = !{i32 {{[0-9]+}}}
+// CHECK: [[SRCLOC]] = !{i64 {{[0-9]+}}}
diff --git a/clang/test/CodeGen/attr-warning.c
b/clang/test/CodeGen/attr-warning.c
index 5c89066aff75a..034ab7869f769 100644
--- a/clang/test/CodeGen/attr-warning.c
+++ b/clang/test/CodeGen/attr-warning.c
@@ -8,4 +8,4 @@ void bar(void) {
// CHECK: call void @foo(), !srcloc [[SRCLOC:![0-9]+]]
// CHECK: declare{{.*}} void @foo() [[ATTR:#[0-9]+]]
// CHECK: attributes [[ATTR]] = {{{.*}}"dontcall-warn"="oh no"
-// CHECK: [[SRCLOC]] = !{i32 {{[0-9]+}}}
+// CHECK: [[SRCLOC]] = !{i64 {{[0-9]+}}}
diff --git a/llvm/include/llvm/IR/DiagnosticInfo.h
b/llvm/include/llvm/IR/DiagnosticInfo.h
index 42373835731d9..b35923efdad5d 100644
--- a/llvm/include/llvm/IR/DiagnosticInfo.h
+++ b/llvm/include/llvm/IR/DiagnosticInfo.h
@@ -1101,16 +1101,16 @@ void diagnoseDontCall(const CallInst &CI);
class DiagnosticInfoDontCall : public DiagnosticInfo {
StringRef CalleeName;
StringRef Note;
- unsigned LocCookie;
+ uint64_t LocCookie;
public:
DiagnosticInfoDontCall(StringRef CalleeName, StringRef Note,
- DiagnosticSeverity DS, unsigned LocCookie)
+ DiagnosticSeverity DS, uint64_t LocCookie)
: DiagnosticInfo(DK_DontCall, DS), CalleeName(CalleeName), Note(Note),
LocCookie(LocCookie) {}
StringRef getFunctionName() const { return CalleeName; }
StringRef getNote() const { return Note; }
- unsigned getLocCookie() const { return LocCookie; }
+ uint64_t getLocCookie() const { return LocCookie; }
void print(DiagnosticPrinter &DP) const override;
static bool classof(const DiagnosticInfo *DI) {
return DI->getKind() == DK_DontCall;
diff --git a/llvm/lib/IR/DiagnosticInfo.cpp b/llvm/lib/IR/DiagnosticInfo.cpp
index 342c4cbbc39d6..c613351678e86 100644
--- a/llvm/lib/IR/DiagnosticInfo.cpp
+++ b/llvm/lib/IR/DiagnosticInfo.cpp
@@ -428,7 +428,7 @@ void llvm::diagnoseDontCall(const CallInst &CI) {
auto Sev = i == 0 ? DS_Error : DS_Warning;
if (F->hasFnAttribute(AttrName)) {
- unsigned LocCookie = 0;
+ uint64_t LocCookie = 0;
auto A = F->getFnAttribute(AttrName);
if (MDNode *MD = CI.getMetadata("srcloc"))
LocCookie =
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
