Author: Serge Pavlov Date: 2023-07-17T14:51:34+07:00 New Revision: cc006acdd6d7280a85c63fe375a4c9d1738e3fcd
URL: https://github.com/llvm/llvm-project/commit/cc006acdd6d7280a85c63fe375a4c9d1738e3fcd DIFF: https://github.com/llvm/llvm-project/commit/cc006acdd6d7280a85c63fe375a4c9d1738e3fcd.diff LOG: [clang] Fix delayed template parsing Commit 98390ccb80569e8fbb20e6c996b4b8cff87fbec6 fixed late template instantiation by clearing FP pragma stack before instantiation. This solution was based on the assumptions: - FP pragma stack is not used anymore and it is safe to clear it, - Default FP options are determined by command line options. Both the assumptions are wrong. When compilation produces precompiled header file, state of the stack is serialized and then restored when the precompiled header is used. Delayed template parsing occurs at the end of translation unit but before serialization, so clearing FP pragma stack effects serialized representation. When the precompiled file is loaded, some conditions can be broken and clang crashed, it was described in https://github.com/llvm/llvm-project/issues/63704. The crash was observed only in few cases, on most buildbots it was absent. The violation of expected conditions was caused by violation of the second assumption. FPEvalMethod can be modified by target, so it is not possible to deduce it from LangOptions only. So default FP state read from precompiled header was different from the state in the initialized Sema, and this was the crash reason. Only two targets do such modification of default FP options, these are i386 and AIX. so the problem was hard to reproduce. Delayed template parsing should occur with empty pragma stack, so it must be cleared before the instantiation, but the stack now is saved and restored after the instantiation is done. This change should fix https://github.com/llvm/llvm-project/issues/63704. Differential Revision: https://reviews.llvm.org/D155380 Added: Modified: clang/include/clang/Sema/Sema.h clang/lib/Parse/ParseTemplate.cpp clang/test/PCH/late-parsed-instantiations.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index dbc071bf5cd838..2ffe3783c2f3e7 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -710,6 +710,16 @@ class Sema final { return result; } + class FpPragmaStackSaveRAII { + public: + FpPragmaStackSaveRAII(Sema &S) : S(S), SavedStack(S.FpPragmaStack) {} + ~FpPragmaStackSaveRAII() { S.FpPragmaStack = std::move(SavedStack); } + + private: + Sema &S; + PragmaStack<FPOptionsOverride> SavedStack; + }; + void resetFPOptions(FPOptions FPO) { CurFPFeatures = FPO; FpPragmaStack.Stack.clear(); diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index 776c66b436472e..fc661d21b63a27 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -1744,6 +1744,7 @@ void Parser::ParseLateTemplatedFuncDef(LateParsedTemplate &LPT) { // Parsing should occur with empty FP pragma stack and FP options used in the // point of the template definition. + Sema::FpPragmaStackSaveRAII SavedStack(Actions); Actions.resetFPOptions(LPT.FPO); assert(!LPT.Toks.empty() && "Empty body!"); diff --git a/clang/test/PCH/late-parsed-instantiations.cpp b/clang/test/PCH/late-parsed-instantiations.cpp index e70147dcee6166..9ae6b56a09befa 100644 --- a/clang/test/PCH/late-parsed-instantiations.cpp +++ b/clang/test/PCH/late-parsed-instantiations.cpp @@ -4,7 +4,9 @@ // RUN: %clang_cc1 -fdelayed-template-parsing -std=c++14 -emit-pch -fpch-instantiate-templates %s -o %t.pch -verify // RUN: %clang_cc1 -fdelayed-template-parsing -std=c++14 -include-pch %t.pch %s -verify -// XFAIL: target={{.*}}-aix{{.*}} +// Run this test for i686 as this is the target that modifies default FP options. +// RUN: %clang_cc1 -triple i686-pc-linux-gnu -fdelayed-template-parsing -std=c++14 -emit-pch -fpch-instantiate-templates %s -o %t.pch -verify +// RUN: %clang_cc1 -triple i686-pc-linux-gnu -fdelayed-template-parsing -std=c++14 -include-pch %t.pch %s -verify #ifndef HEADER_INCLUDED _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
