Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing build breakage from #4676. #4822

Merged
merged 1 commit into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iree/compiler/Dialect/HAL/Target/LLVM/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ cc_library(
":LLVMTargetOptions",
"@llvm-project//llvm:Analysis",
"@llvm-project//llvm:Core",
"@llvm-project//llvm:Instrumentation",
"@llvm-project//llvm:Passes",
"@llvm-project//llvm:Support",
"@llvm-project//llvm:Target",
Expand Down
1 change: 1 addition & 0 deletions iree/compiler/Dialect/HAL/Target/LLVM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ iree_cc_library(
::LLVMTargetOptions
LLVMAnalysis
LLVMCore
LLVMInstrumentation
LLVMPasses
LLVMSupport
LLVMTarget
Expand Down
1 change: 1 addition & 0 deletions iree/hal/local/loaders/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ cc_library(
],
deps = [
"//iree/base:api",
"//iree/base:core_headers",
"//iree/base:dynamic_library",
"//iree/base:flatcc",
"//iree/base:tracing",
Expand Down
1 change: 1 addition & 0 deletions iree/hal/local/loaders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ iree_cc_library(
"legacy_library_loader.cc"
DEPS
iree::base::api
iree::base::core_headers
iree::base::dynamic_library
iree::base::flatcc
iree::base::internal::file_io
Expand Down
23 changes: 14 additions & 9 deletions iree/hal/local/loaders/legacy_library_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,20 @@ static iree_status_t iree_hal_dylib_executable_flatbuffer_verify(
switch (iree_DyLibExecutableDef_sanitized_kind_get(executable_def)) {
case iree_SanitizerKind_None:
break;
case iree_SanitizerKind_Address: {
if (!IREE_SANITIZER_ADDRESS) {
return iree_make_status(
IREE_STATUS_UNAVAILABLE,
"Dynamic library executable is compiled with ASAN support, but "
"this host application failed to enable ASAN to load this "
"executable");
}
} break;
#if !defined(IREE_SANITIZER_ADDRESS)
case iree_SanitizerKind_Address:
return iree_make_status(
IREE_STATUS_UNAVAILABLE,
"Executable library is compiled with ASAN support but the host "
"runtime is not compiled with it enabled; add -fsanitize=address to "
"the runtime compilation options");
#endif // !IREE_SANITIZER_ADDRESS
default:
return iree_make_status(
IREE_STATUS_UNAVAILABLE,
"Executable library requires a sanitizer the host runtime is not "
"compiled to enable/understand: %u",
(uint32_t)iree_DyLibExecutableDef_sanitized_kind_get(executable_def));
}

return iree_ok_status();
Expand Down