[clang] c63b9a5 - [clang-interp] Use -fno-sized-deallocation in two tests (#95546)

via cfe-commits cfe-commits at lists.llvm.org
Fri Jun 14 12:37:20 PDT 2024


Author: Nico Weber
Date: 2024-06-14T15:37:17-04:00
New Revision: c63b9a5af72a7d83d936c12ae4bc79828c073edf

URL: https://github.com/llvm/llvm-project/commit/c63b9a5af72a7d83d936c12ae4bc79828c073edf
DIFF: https://github.com/llvm/llvm-project/commit/c63b9a5af72a7d83d936c12ae4bc79828c073edf.diff

LOG: [clang-interp] Use -fno-sized-deallocation in two tests (#95546)

At least on my Windows machine, these two tests fail due to not being
able to look up `??3 at YAXPEAX_K@Z` (which is
`void __cdecl operator delete(void *, unsigned __int64)` in demangled)
after 130e93cc26ca. Since they don't test anything related to sized
deallocation, just disable sized allocation for them.

Possibly fixes #95451.

Added: 
    

Modified: 
    clang/test/Interpreter/inline-virtual.cpp
    clang/unittests/Interpreter/InterpreterTest.cpp

Removed: 
    


################################################################################
diff  --git a/clang/test/Interpreter/inline-virtual.cpp b/clang/test/Interpreter/inline-virtual.cpp
index d862b3354f61f..9c31208a4a642 100644
--- a/clang/test/Interpreter/inline-virtual.cpp
+++ b/clang/test/Interpreter/inline-virtual.cpp
@@ -3,8 +3,10 @@
 //
 // We disable RTTI to avoid problems on Windows for non-RTTI builds of LLVM
 // where the JIT cannot find ??_7type_info@@6B at .
-// RUN: cat %s | clang-repl -Xcc -fno-rtti | FileCheck %s
-// RUN: cat %s | clang-repl -Xcc -fno-rtti -Xcc -O2 | FileCheck %s
+// RUN: cat %s | clang-repl -Xcc -fno-rtti -Xcc -fno-sized-deallocation \
+// RUN:     | FileCheck %s
+// RUN: cat %s | clang-repl -Xcc -fno-rtti -Xcc -fno-sized-deallocation \
+// RUN:     -Xcc -O2 | FileCheck %s
 
 extern "C" int printf(const char *, ...);
 

diff  --git a/clang/unittests/Interpreter/InterpreterTest.cpp b/clang/unittests/Interpreter/InterpreterTest.cpp
index 683295a18d519..bbd854149d5f5 100644
--- a/clang/unittests/Interpreter/InterpreterTest.cpp
+++ b/clang/unittests/Interpreter/InterpreterTest.cpp
@@ -286,7 +286,8 @@ TEST_F(InterpreterTest, InstantiateTemplate) {
 // https://github.com/llvm/llvm-project/issues/94994.
 #ifndef __arm__
 TEST_F(InterpreterTest, Value) {
-  std::unique_ptr<Interpreter> Interp = createInterpreter();
+  std::vector<const char *> Args = {"-fno-sized-deallocation"};
+  std::unique_ptr<Interpreter> Interp = createInterpreter(Args);
 
   Value V1;
   llvm::cantFail(Interp->ParseAndExecute("int x = 42;"));


        


More information about the cfe-commits mailing list