Skip to content

Conversation

@fmayer
Copy link
Contributor

@fmayer fmayer commented Mar 25, 2025

No description provided.

Created using spr 1.3.4
@llvmbot llvmbot added clang Clang issues not falling into any other category clang:codegen IR generation bugs: mangling, exceptions, etc. debuginfo labels Mar 25, 2025
@fmayer fmayer requested a review from vitalybuka March 25, 2025 21:06
@llvmbot
Copy link
Member

llvmbot commented Mar 25, 2025

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-codegen

Author: Florian Mayer (fmayer)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/132993.diff

2 Files Affected:

  • (modified) clang/lib/CodeGen/CGDebugInfo.cpp (+1-1)
  • (modified) clang/lib/CodeGen/CGDebugInfo.h (+1-1)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index dcccbc0835d95..54025b767dc81 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1791,7 +1791,7 @@ CGDebugInfo::createInlinedTrapSubprogram(StringRef FuncName,
   // We are caching the subprogram because we don't want to duplicate
   // subprograms with the same message. Note that `SPFlagDefinition` prevents
   // subprograms from being uniqued.
-  llvm::DISubprogram *&SP = InlinedTrapFuncMap[FuncName];
+  llvm::DISubprogram *&SP = InlinedSubprogramMap[FuncName];
 
   if (!SP) {
     llvm::DISubroutineType *DIFnTy = DBuilder.createSubroutineType(nullptr);
diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
index 38f73eca561b7..9db5113fe5d8e 100644
--- a/clang/lib/CodeGen/CGDebugInfo.h
+++ b/clang/lib/CodeGen/CGDebugInfo.h
@@ -355,7 +355,7 @@ class CGDebugInfo {
       llvm::ArrayRef<llvm::Metadata *> PreviousFieldsDI, const RecordDecl *RD);
 
   /// A cache that maps names of artificial inlined functions to subprograms.
-  llvm::StringMap<llvm::DISubprogram *> InlinedTrapFuncMap;
+  llvm::StringMap<llvm::DISubprogram *> InlinedSubprogramMap;
 
   /// A function that returns the subprogram corresponding to the artificial
   /// inlined function for traps.

@fmayer fmayer merged commit 5427973 into main Mar 25, 2025
13 of 15 checks passed
@fmayer fmayer deleted the users/fmayer/spr/nfc-clang-rename-inlinedtrapfuncmap-to-inlinedsubprogrammap branch March 25, 2025 22:03
@llvm-ci
Copy link
Collaborator

llvm-ci commented Mar 25, 2025

LLVM Buildbot has detected a new failure on builder lldb-aarch64-ubuntu running on linaro-lldb-aarch64-ubuntu while building clang at step 6 "test".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/14924

Here is the relevant piece of the build log for the reference
Step 6 (test) failure: build (failure)
...
PASS: lldb-api :: functionalities/source-map/TestTargetSourceMap.py (584 of 2110)
PASS: lldb-api :: functionalities/reverse-execution/TestReverseContinueBreakpoints.py (585 of 2110)
PASS: lldb-api :: functionalities/gdb_remote_client/TestPlatformClient.py (586 of 2110)
PASS: lldb-api :: functionalities/stats_api/TestStatisticsAPI.py (587 of 2110)
PASS: lldb-api :: functionalities/step-avoids-regexp/TestStepAvoidsRegexp.py (588 of 2110)
PASS: lldb-api :: functionalities/signal/raise/TestRaise.py (589 of 2110)
PASS: lldb-api :: functionalities/step-avoids-no-debug/TestStepNoDebug.py (590 of 2110)
PASS: lldb-api :: functionalities/step_scripted/TestStepScripted.py (591 of 2110)
PASS: lldb-api :: functionalities/recursion/TestValueObjectRecursion.py (592 of 2110)
PASS: lldb-api :: functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py (593 of 2110)
FAIL: lldb-api :: functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py (594 of 2110)
******************** TEST 'lldb-api :: functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py' FAILED ********************
Script:
--
/usr/bin/python3.10 /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/llvm-project/lldb/test/API/dotest.py -u CXXFLAGS -u CFLAGS --env LLVM_LIBS_DIR=/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./lib --env LLVM_INCLUDE_DIR=/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/include --env LLVM_TOOLS_DIR=/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin --arch aarch64 --build-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/lldb-test-build.noindex --lldb-module-cache-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/lldb-test-build.noindex/module-cache-lldb/lldb-api --clang-module-cache-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/lldb-test-build.noindex/module-cache-clang/lldb-api --executable /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin/lldb --compiler /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin/clang --dsymutil /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin/dsymutil --make /usr/bin/gmake --llvm-tools-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin --lldb-obj-root /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/tools/lldb --lldb-libs-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./lib /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/llvm-project/lldb/test/API/functionalities/stop-on-sharedlibrary-load -p TestStopOnSharedlibraryEvents.py
--
Exit Code: -11

Command Output (stdout):
--
lldb version 21.0.0git (https://github.com/llvm/llvm-project.git revision 542797317ae4e98c8aa9030368d851fc72070f95)
  clang revision 542797317ae4e98c8aa9030368d851fc72070f95
  llvm revision 542797317ae4e98c8aa9030368d851fc72070f95
Skipping the following test categories: ['libc++', 'dsym', 'gmodules', 'debugserver', 'objc']

--
Command Output (stderr):
--
PASS: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_auto_continue (TestStopOnSharedlibraryEvents.TestStopOnSharedlibraryEvents)
PASS: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_continue_callback (TestStopOnSharedlibraryEvents.TestStopOnSharedlibraryEvents)
PASS: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_failing_condition (TestStopOnSharedlibraryEvents.TestStopOnSharedlibraryEvents)
PASS: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_stopping_breakpoints (TestStopOnSharedlibraryEvents.TestStopOnSharedlibraryEvents)
----------------------------------------------------------------------
Ran 4 tests in 1.995s

OK

--

********************
PASS: lldb-api :: functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py (595 of 2110)
XFAIL: lldb-api :: functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py (596 of 2110)
PASS: lldb-api :: functionalities/step-vrs-interrupt/TestStepVrsInterruptTimeout.py (597 of 2110)
XFAIL: lldb-api :: functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py (598 of 2110)
PASS: lldb-api :: functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py (599 of 2110)
PASS: lldb-api :: functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py (600 of 2110)
PASS: lldb-api :: functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py (601 of 2110)
PASS: lldb-api :: functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py (602 of 2110)
PASS: lldb-api :: functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py (603 of 2110)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang:codegen IR generation bugs: mangling, exceptions, etc. clang Clang issues not falling into any other category debuginfo

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants