Skip to content

Commit 5c2363d

Browse files
qinkunbaovitalybuka
authored andcommitted
rebase
Created using spr 1.3.6
2 parents 28b35ef + 5db4aea commit 5c2363d

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: rm -rf %t
22
// RUN: split-file %s %t
3-
// 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
3+
44
// 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
55

6+
// 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
67
// 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
7-
// 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
8-
98
// 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
10-
// 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
9+
// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict3 -emit-llvm %t/test1.c -o - | FileCheck %s --check-prefixes=CHECK1,IGNORE
10+
// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsanitize=signed-integer-overflow -fsanitize-ignorelist=%t/src.ignorelist.contradict4 -emit-llvm %t/test1.c -o - | FileCheck %s --check-prefixes=CHECK1,SANITIZE
1111

1212

1313
// Verify ubsan only emits checks for files in the allowlist
@@ -26,6 +26,18 @@ src:*
2626
src:*/test1.c
2727
src:*/test1.c=sanitize
2828

29+
//--- src.ignorelist.contradict3
30+
src:*
31+
src:*/test1.c
32+
src:*/test1.c=sanitize
33+
src:*/test1.c
34+
35+
//--- src.ignorelist.contradict4
36+
src:*
37+
src:*/test1.c=sanitize
38+
src:*/test1.c
39+
src:*/test1.c=sanitize
40+
2941
//--- test1.c
3042
// CHECK1-LABEL: define dso_local i32 @add
3143
int add(int a, int b) {

lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export async function createDebugAdapterExecutable(
184184
...configEnvironment,
185185
...env,
186186
},
187+
cwd: workspaceFolder!!.uri.fsPath,
187188
};
188189
const dbgArgs = await getDAPArguments(workspaceFolder, configuration);
189190

0 commit comments

Comments
 (0)