rebase

Created using spr 1.3.6

Author: qinkunbao

clang/test/CodeGen/ubsan-src-ignorelist-category.test

@@ -1,17 +1,16 @@
 // RUN: rm -rf %t
 // RUN: split-file %s %t
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist -emit-llvm %t/test1.c -o -             | FileCheck %s --check-prefixes=CHECK1,IGNORE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist -emit-llvm %t/test1.c -o -             | FileCheck %s --check-prefixes=CHECK1,SANITIZE
 // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist -emit-llvm %t/test2.c -o -             | FileCheck %s --check-prefixes=CHECK2
 
 // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict1 -emit-llvm %t/test1.c -o - | FileCheck %s --check-prefixes=CHECK1,IGNORE
 // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict1 -emit-llvm %t/test2.c -o - | FileCheck %s --check-prefixes=CHECK2
 
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict2 -emit-llvm %t/test1.c -o - | FileCheck %s --check-prefixes=CHECK1,IGNORE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict2 -emit-llvm %t/test1.c -o - | FileCheck %s --check-prefixes=CHECK1,SANITIZE
 // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict2 -emit-llvm %t/test2.c -o - | FileCheck %s --check-prefixes=CHECK2
 
 
 // Verify ubsan only emits checks for files in the allowlist
-// FIXME: implement.
 
 //--- src.ignorelist
 src:*
@@ -31,7 +30,7 @@ src:*/test1.c=sanitize
 // CHECK1-LABEL: define dso_local i32 @add
 int add(int a, int b) {
 // IGNORE: %add = add nsw
-// SANITIZE: %add = llvm.sadd.with.overflow.i32
+// SANITIZE: = call { i32, i1 } @llvm.sadd.with.overflow.i32
     return a+b;
 }
 

llvm/utils/gn/secondary/lldb/test/BUILD.gn

@@ -23,7 +23,6 @@ template("write_lit_cfg") {
       "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
       "LLVM_SOURCE_DIR=" + rebase_path("//llvm"),
       "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
-      "Python3_EXECUTABLE=$python_path",
       "LLVM_TARGET_TRIPLE=$llvm_target_triple",
     ]
     values += invoker.extra_values
@@ -44,7 +43,10 @@ write_lit_cfg("lit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
   input = "//lldb/test/lit.site.cfg.py.in"
   output = lldb_lit_site_cfg_file
-  extra_values = [ "LLVM_BUILD_MODE=." ]
+  extra_values = [
+    "LLVM_BUILD_MODE=.",
+    "Python3_EXECUTABLE=$python_path",
+  ]
 }
 
 write_lit_cfg("lit_api_site_cfg") {
@@ -63,6 +65,7 @@ write_lit_cfg("lit_api_site_cfg") {
     "LLDB_ENABLE_PYTHON=0",
     "LLDB_HAS_LIBCXX=False",  # FIXME: support this (?)
     "LLDB_LIBS_DIR=",  # FIXME: for shared builds only (?)
+    "LLDB_PYTHON_API_TEST_EXECUTABLE=$python_path",
     "LLDB_TEST_ARCH=$current_cpu",
     "LLDB_TEST_COMPILER=" + rebase_path("$root_build_dir/bin/clang"),
     "LLDB_TEST_BUILD_DIRECTORY=" + rebase_path("$target_gen_dir/test_build"),
@@ -131,6 +134,7 @@ write_lit_cfg("lit_shell_site_cfg") {
     "LLDB_USE_SYSTEM_DEBUGSERVER=1",  # XXX port //lldb/tools/debugserver (?)
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
     "LLVM_USE_SANITIZER=",
+    "Python3_EXECUTABLE=$python_path",
   ]
 
   if (llvm_enable_zlib) {
@@ -155,6 +159,7 @@ write_lit_cfg("lit_unit_site_cfg") {
   extra_values = [
     "LLVM_BUILD_MODE=.",
     "LLVM_USE_SANITIZER=",
+    "Python3_EXECUTABLE=$python_path",
   ]
 }