Author: Timm Baeder Date: 2025-10-20T12:55:06+02:00 New Revision: 7b0c51a43917fdd4dae2f9415b6c041ca4d1c3f1
URL: https://github.com/llvm/llvm-project/commit/7b0c51a43917fdd4dae2f9415b6c041ca4d1c3f1 DIFF: https://github.com/llvm/llvm-project/commit/7b0c51a43917fdd4dae2f9415b6c041ca4d1c3f1.diff LOG: [clang][bytecode] Fix a crash when redeclaring extern globals (#164204) One iteration of this loop might've already fixed up the pointers of coming globals, so check for that explicitly. Fixes https://github.com/llvm/llvm-project/issues/164151 Added: Modified: clang/lib/AST/ByteCode/Program.cpp clang/test/AST/ByteCode/extern.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/Program.cpp b/clang/lib/AST/ByteCode/Program.cpp index e653782f61fdf..e0b2852f0e906 100644 --- a/clang/lib/AST/ByteCode/Program.cpp +++ b/clang/lib/AST/ByteCode/Program.cpp @@ -226,7 +226,10 @@ UnsignedOrNone Program::createGlobal(const ValueDecl *VD, const Expr *Init) { Globals[PIdx] = NewGlobal; // All pointers pointing to the previous extern decl now point to the // new decl. - RedeclBlock->movePointersTo(NewGlobal->block()); + // A previous iteration might've already fixed up the pointers for this + // global. + if (RedeclBlock != NewGlobal->block()) + RedeclBlock->movePointersTo(NewGlobal->block()); } } PIdx = *Idx; diff --git a/clang/test/AST/ByteCode/extern.cpp b/clang/test/AST/ByteCode/extern.cpp index a616269911a7e..c3215931d41f8 100644 --- a/clang/test/AST/ByteCode/extern.cpp +++ b/clang/test/AST/ByteCode/extern.cpp @@ -1,9 +1,11 @@ // RUN: %clang_cc1 -fexperimental-new-constant-interpreter -verify=both,expected %s -// RUN: %clang_cc1 -verify=both,ref %s - +// RUN: %clang_cc1 -verify=both,ref %s // both-no-diagnostics +extern const double Num; +extern const double Num = 12; + extern const int E; constexpr int getE() { return E; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
