Merged main:024718313b52 into amd-gfx:ff07c6f2ec34

SC llvm team · SC llvm team · commit fe664d7a82a6 · 2023-11-24T23:55:55.000-05:00
Local branch amd-gfx ff07c6f Merged main:5ac5c0e7d100 into amd-gfx:748e3557cc2b Remote branch main 0247183 [Flang] Fix a test case that depends on stderr output of nullptr. (llvm#73349)
diff --git a/flang/unittests/Runtime/RuntimeCrashTest.cpp b/flang/unittests/Runtime/RuntimeCrashTest.cpp
@@ -43,9 +43,9 @@ TEST(TestTerminator, CheckFailedLocationTest) {
 }
 
 TEST(TestTerminator, CheckFailedTest) {
-  static Fortran::runtime::Terminator t;
+  static Fortran::runtime::Terminator t("someFileName");
   ASSERT_DEATH(t.CheckFailed("predicate"),
-      "RUNTIME_CHECK\\(predicate\\) failed at \\(null\\)\\(0\\)");
+      "RUNTIME_CHECK\\(predicate\\) failed at someFileName\\(0\\)");
 }
 
 //------------------------------------------------------------------------------
diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
@@ -16,7 +16,7 @@
 
 /* Indicate that this is LLVM compiled from the amd-gfx branch. */
 #define LLVM_HAVE_BRANCH_AMD_GFX
-#define LLVM_MAIN_REVISION 481697
+#define LLVM_MAIN_REVISION 481698
 
 /* Define if LLVM_ENABLE_DUMP is enabled */
 #cmakedefine LLVM_ENABLE_DUMP

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ TEST(TestTerminator, CheckFailedLocationTest) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`TEST(TestTerminator, CheckFailedTest) {`
`46`		`- static Fortran::runtime::Terminator t;`
	`46`	`+ static Fortran::runtime::Terminator t("someFileName");`
`47`	`47`	`ASSERT_DEATH(t.CheckFailed("predicate"),`
`48`		`- "RUNTIME_CHECK\\(predicate\\) failed at \\(null\\)\\(0\\)");`
	`48`	`+ "RUNTIME_CHECK\\(predicate\\) failed at someFileName\\(0\\)");`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`//------------------------------------------------------------------------------`