Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for builtin_verbose_trap #79230

Merged
merged 19 commits into from
Jun 25, 2024
Merged

Add support for builtin_verbose_trap #79230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
95200f3
Add support for builtin_verbose_trap
ahatanak Jan 16, 2024
156e9de
Fix diagnostic message
ahatanak Jan 24, 2024
78b1c45
Address review comments
ahatanak Jan 25, 2024
856fd3d
Address review comments
ahatanak Jan 29, 2024
5efc514
Add triple to test
ahatanak Jan 30, 2024
0ff6ac0
Address review comments
ahatanak Feb 1, 2024
206e55d
Pass a better file scope when creating the subprogram for the artificial
ahatanak Feb 1, 2024
4aa91cc
Address review comments
ahatanak Mar 5, 2024
521fe91
Define CLANG_VERBOSE_TRAP_PREFIX in public header
ahatanak Mar 12, 2024
c72fc17
Address review comments
ahatanak Mar 20, 2024
5bbb01b
Use three forward slashes
ahatanak Mar 20, 2024
4896af0
Fix test
ahatanak Apr 1, 2024
7463986
Pass category string to the builtin
ahatanak Apr 25, 2024
c7bd914
Use $ as the separator
ahatanak Apr 25, 2024
1db9628
Use a shorter prefix
ahatanak May 1, 2024
6881d0d
Use as the prefix
ahatanak Jun 21, 2024
65671ff
Reject arguments using '$'
ahatanak Jun 21, 2024
ae3907d
Define CLANG_TRAP_PREFIX as an inline constexpr StringRef
ahatanak Jun 24, 2024
e13d85c
Rename variable
ahatanak Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion clang/include/clang/CodeGen/ModuleBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "clang/AST/ASTConsumer.h"
#include "clang/Basic/LLVM.h"
#include "llvm/ADT/StringRef.h"

namespace llvm {
class Constant;
Expand All @@ -28,7 +29,7 @@ namespace llvm {
}

// Prefix of the name of the artificial inline frame.
#define CLANG_TRAP_PREFIX "__clang_trap_msg"
inline constexpr llvm::StringRef CLANG_TRAP_PREFIX = "__clang_trap_msg";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name should be changed to use the usual variable/constant naming convention (ClangTrapPrefix, I think, in this case).


namespace clang {
class CodeGenOptions;
Expand Down
3 changes: 1 addition & 2 deletions clang/lib/CodeGen/CGDebugInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3515,8 +3515,7 @@ llvm::DILocation *CGDebugInfo::CreateTrapFailureMessageFor(
llvm::DebugLoc TrapLocation, StringRef Category, StringRef FailureMsg) {
// Create a debug location from `TrapLocation` that adds an artificial inline
// frame.
const char *Prefix = CLANG_TRAP_PREFIX;
SmallString<64> FuncName(Prefix);
SmallString<64> FuncName(CLANG_TRAP_PREFIX);

FuncName += "$";
FuncName += Category;
Expand Down