[clang] 651b40e - Revert "[C++20] [Modules] Serialize the evaluated constant values for VarDecl"
Chuanqi Xu via cfe-commits
cfe-commits at lists.llvm.org
Tue May 23 22:57:35 PDT 2023
Author: Chuanqi Xu
Date: 2023-05-24T13:56:09+08:00
New Revision: 651b40e8ffa67efcc6f59cdd7715817678c6b632
URL: https://github.com/llvm/llvm-project/commit/651b40e8ffa67efcc6f59cdd7715817678c6b632
DIFF: https://github.com/llvm/llvm-project/commit/651b40e8ffa67efcc6f59cdd7715817678c6b632.diff
LOG: Revert "[C++20] [Modules] Serialize the evaluated constant values for VarDecl"
This reverts commit c0d6f85e3ae8bcfdb7217d165314f01c1a4af9ae. The asan
bot detected a memory leak after this patch. Revert it for now.
Added:
Modified:
clang/lib/Serialization/ASTReaderDecl.cpp
clang/lib/Serialization/ASTWriter.cpp
clang/unittests/Serialization/CMakeLists.txt
Removed:
clang/unittests/Serialization/VarDeclConstantInitTest.cpp
################################################################################
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp
index 7ce2640c279f4..5ce7007d8acef 100644
--- a/clang/lib/Serialization/ASTReaderDecl.cpp
+++ b/clang/lib/Serialization/ASTReaderDecl.cpp
@@ -1659,10 +1659,6 @@ void ASTDeclReader::ReadVarDeclInit(VarDecl *VD) {
EvaluatedStmt *Eval = VD->ensureEvaluatedStmt();
Eval->HasConstantInitialization = (Val & 2) != 0;
Eval->HasConstantDestruction = (Val & 4) != 0;
- Eval->WasEvaluated = (Val & 8) != 0;
- if (Eval->WasEvaluated)
- Eval->Evaluated = Record.readAPValue();
-
// Store the offset of the initializer. Don't deserialize it yet: it might
// not be needed, and might refer back to the variable, for example if it
// contains a lambda.
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index 4efc27b3d2434..749aaa4cd6e19 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -5987,20 +5987,13 @@ void ASTRecordWriter::AddVarDeclInit(const VarDecl *VD) {
return;
}
- uint64_t Val = 1;
+ unsigned Val = 1;
if (EvaluatedStmt *ES = VD->getEvaluatedStmt()) {
Val |= (ES->HasConstantInitialization ? 2 : 0);
Val |= (ES->HasConstantDestruction ? 4 : 0);
- APValue *Evaluated = VD->getEvaluatedValue();
- // If the evaluted result is constant, emit it.
- if (Evaluated && (Evaluated->isInt() || Evaluated->isFloat()))
- Val |= 8;
+ // FIXME: Also emit the constant initializer value.
}
push_back(Val);
- if (Val & 8) {
- AddAPValue(*VD->getEvaluatedValue());
- }
-
writeStmtRef(Init);
}
diff --git a/clang/unittests/Serialization/CMakeLists.txt b/clang/unittests/Serialization/CMakeLists.txt
index 88aca2e135200..cfb4089167aad 100644
--- a/clang/unittests/Serialization/CMakeLists.txt
+++ b/clang/unittests/Serialization/CMakeLists.txt
@@ -8,7 +8,6 @@ add_clang_unittest(SerializationTests
InMemoryModuleCacheTest.cpp
ModuleCacheTest.cpp
SourceLocationEncodingTest.cpp
- VarDeclConstantInitTest.cpp
)
clang_target_link_libraries(SerializationTests
@@ -19,5 +18,4 @@ clang_target_link_libraries(SerializationTests
clangLex
clangSema
clangSerialization
- clangTooling
)
diff --git a/clang/unittests/Serialization/VarDeclConstantInitTest.cpp b/clang/unittests/Serialization/VarDeclConstantInitTest.cpp
deleted file mode 100644
index 33fc82b9adc75..0000000000000
--- a/clang/unittests/Serialization/VarDeclConstantInitTest.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//===- unittests/Serialization/VarDeclConstantInitTest.cpp - CI tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Frontend/Utils.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-class VarDeclConstantInitTest : public ::testing::Test {
- void SetUp() override {
- ASSERT_FALSE(sys::fs::createUniqueDirectory("modules-test", TestDir));
- }
-
- void TearDown() override { sys::fs::remove_directories(TestDir); }
-
-public:
- SmallString<256> TestDir;
-
- void addFile(StringRef Path, StringRef Contents) {
- ASSERT_FALSE(sys::path::is_absolute(Path));
-
- SmallString<256> AbsPath(TestDir);
- sys::path::append(AbsPath, Path);
-
- ASSERT_FALSE(
- sys::fs::create_directories(llvm::sys::path::parent_path(AbsPath)));
-
- std::error_code EC;
- llvm::raw_fd_ostream OS(AbsPath, EC);
- ASSERT_FALSE(EC);
- OS << Contents;
- }
-};
-
-TEST_F(VarDeclConstantInitTest, CachedConstantInit) {
- addFile("Cached.cppm", R"cpp(
-export module Fibonacci.Cache;
-
-export namespace Fibonacci
-{
- constexpr unsigned long Recursive(unsigned long n)
- {
- if (n == 0)
- return 0;
- if (n == 1)
- return 1;
- return Recursive(n - 2) + Recursive(n - 1);
- }
-
- template<unsigned long N>
- struct Number{};
-
- struct DefaultStrategy
- {
- constexpr unsigned long operator()(unsigned long n, auto... other) const
- {
- return (n + ... + other);
- }
- };
-
- constexpr unsigned long Compute(Number<10ul>, auto strategy)
- {
- return strategy(Recursive(10ul));
- }
-
- template<unsigned long N, typename Strategy = DefaultStrategy>
- constexpr unsigned long Cache = Compute(Number<N>{}, Strategy{});
-
- template constexpr unsigned long Cache<10ul>;
-}
- )cpp");
-
- IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
- CompilerInstance::createDiagnostics(new DiagnosticOptions());
- CreateInvocationOptions CIOpts;
- CIOpts.Diags = Diags;
-
- std::string CacheBMIPath = llvm::Twine(TestDir + "/Cached.pcm").str();
- const char *Args[] = {
- "clang++", "-std=c++20", "--precompile", "-working-directory",
- TestDir.c_str(), "Cached.cppm", "-o", CacheBMIPath.c_str()};
- std::shared_ptr<CompilerInvocation> Invocation =
- createInvocation(Args, CIOpts);
- ASSERT_TRUE(Invocation);
-
- CompilerInstance Instance;
- Instance.setDiagnostics(Diags.get());
- Instance.setInvocation(Invocation);
- GenerateModuleInterfaceAction Action;
- ASSERT_TRUE(Instance.ExecuteAction(Action));
- ASSERT_FALSE(Diags->hasErrorOccurred());
-
- std::string DepArg =
- llvm::Twine("-fmodule-file=Fibonacci.Cache=" + CacheBMIPath).str();
- std::unique_ptr<ASTUnit> AST = tooling::buildASTFromCodeWithArgs(
- R"cpp(
-import Fibonacci.Cache;
- )cpp",
- /*Args=*/{"-std=c++20", DepArg.c_str()});
-
- using namespace clang::ast_matchers;
- ASTContext &Ctx = AST->getASTContext();
- const auto *cached = selectFirst<VarDecl>(
- "Cache",
- match(varDecl(isTemplateInstantiation(), hasName("Cache")).bind("Cache"),
- Ctx));
- EXPECT_TRUE(cached);
- EXPECT_TRUE(cached->getEvaluatedStmt());
- EXPECT_TRUE(cached->getEvaluatedStmt()->WasEvaluated);
- EXPECT_TRUE(cached->getEvaluatedValue());
- EXPECT_TRUE(cached->getEvaluatedValue()->isInt());
- EXPECT_EQ(cached->getEvaluatedValue()->getInt(), 55);
-}
-
-} // anonymous namespace
More information about the cfe-commits
mailing list