Revert "[C++20] [Modules] Serialize the evaluated constant values for…

… VarDecl"

This reverts commit c0d6f85. The asan
bot detected a memory leak after this patch. Revert it for now.

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.

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);
 }
 

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
   )