[JITLayers] Consume errors on address lookup

vchuravy · vchuravy · commit b816edc7f060 · 2021-01-14T13:22:16.000-05:00
diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
@@ -814,13 +814,21 @@ JL_JITSymbol JuliaOJIT::findUnmangledSymbol(StringRef Name)
 uint64_t JuliaOJIT::getGlobalValueAddress(StringRef Name)
 {
     auto addr = findSymbol(getMangledName(Name), false);
-    return addr ? cantFail(addr.getAddress()) : 0;
+    if (!addr) {
+        consumeError(addr.takeError());
+        return 0;
+    }
+    return cantFail(addr.getAddress());
 }
 
 uint64_t JuliaOJIT::getFunctionAddress(StringRef Name)
 {
     auto addr = findSymbol(getMangledName(Name), false);
-    return addr ? cantFail(addr.getAddress()) : 0;
+    if (!addr) {
+        consumeError(addr.takeError());
+        return 0;
+    }
+    return cantFail(addr.getAddress());
 }
 
 static int globalUniqueGeneratedNames;

Original file line number	Diff line number	Diff line change
`@@ -814,13 +814,21 @@ JL_JITSymbol JuliaOJIT::findUnmangledSymbol(StringRef Name)`
`814`	`814`	`uint64_t JuliaOJIT::getGlobalValueAddress(StringRef Name)`
`815`	`815`	`{`
`816`	`816`	`auto addr = findSymbol(getMangledName(Name), false);`
`817`		`- return addr ? cantFail(addr.getAddress()) : 0;`
	`817`	`+ if (!addr) {`
	`818`	`+ consumeError(addr.takeError());`
	`819`	`+ return 0;`
	`820`	`+ }`
	`821`	`+ return cantFail(addr.getAddress());`
`818`	`822`	`}`
`819`	`823`
`820`	`824`	`uint64_t JuliaOJIT::getFunctionAddress(StringRef Name)`
`821`	`825`	`{`
`822`	`826`	`auto addr = findSymbol(getMangledName(Name), false);`
`823`		`- return addr ? cantFail(addr.getAddress()) : 0;`
	`827`	`+ if (!addr) {`
	`828`	`+ consumeError(addr.takeError());`
	`829`	`+ return 0;`
	`830`	`+ }`
	`831`	`+ return cantFail(addr.getAddress());`
`824`	`832`	`}`
`825`	`833`
`826`	`834`	`static int globalUniqueGeneratedNames;`