Merge commit '89a7e4283be8' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 63a0bdadb527 · 2021-11-04T18:18:03.000-07:00
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll b/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
@@ -3,6 +3,8 @@
 ; XFAIL: arm, cygwin, windows-msvc, windows-gnu
 ; UNSUPPORTED: powerpc64-unknown-linux-gnu
 ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
+; FIXME: Something hangs here.
+; UNSUPPORTED: use_msan_with_origins
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
diff --git a/llvm/test/ExecutionEngine/OrcLazy/multiple-compile-threads-basic.ll b/llvm/test/ExecutionEngine/OrcLazy/multiple-compile-threads-basic.ll
@@ -1,6 +1,9 @@
 ; RUN: lli -jit-kind=orc-lazy -compile-threads=2 -thread-entry hello %s | FileCheck %s
 ; REQUIRES: thread_support
 ;
+; FIXME: Something hangs here.
+; UNSUPPORTED: use_msan_with_origins
+;
 ; CHECK: Hello
 
 @.str = private unnamed_addr constant [7 x i8] c"Hello\0A\00", align 1
diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
@@ -402,3 +402,6 @@ def have_ld64_plugin_support():
 
 if config.expensive_checks:
     config.available_features.add('expensive_checks')
+
+if "MemoryWithOrigins" in config.llvm_use_sanitizer:
+    config.available_features.add('use_msan_with_origins')

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`; RUN: lli -jit-kind=orc-lazy -compile-threads=2 -thread-entry hello %s \| FileCheck %s`
`2`	`2`	`; REQUIRES: thread_support`
`3`	`3`	`;`
	`4`	`+; FIXME: Something hangs here.`
	`5`	`+; UNSUPPORTED: use_msan_with_origins`
	`6`	`+;`
`4`	`7`	`; CHECK: Hello`
`5`	`8`
`6`	`9`	`@.str = private unnamed_addr constant [7 x i8] c"Hello\0A\00", align 1`