Skip to content

Commit 0c553cc

Browse files
committed
[MLIR] Add forgotten directory Support to unittests cmake
The Support directory was removed from the unittests cmake when the directory was removed in 204c3b5. Subsequent commits added the directory back but seem to have missed adding it back to the cmake. This patch also removes MLIRSupportIndentedStream from the list of linked libraries to avoid an ODR violation (it's already part of MLIRSupport which is also being linked here). Otherwise ASAN complains: ``` ================================================================= ==102592==ERROR: AddressSanitizer: odr-violation (0x7fbdf214eee0): [1] size=120 'vtable for mlir::raw_indented_ostream' /home/arjun/llvm-project/mlir/lib/Support/IndentedOstream.cpp [2] size=120 'vtable for mlir::raw_indented_ostream' /home/arjun/llvm-project/mlir/lib/Support/IndentedOstream.cpp These globals were registered at these points: [1]: #0 0x28a71d in __asan_register_globals (/home/arjun/llvm-project/build/tools/mlir/unittests/Support/MLIRSupportTests+0x28a71d) #1 0x7fbdf214a61b in asan.module_ctor (/home/arjun/llvm-project/build/lib/libMLIRSupportIndentedOstream.so.14git+0x661b) [2]: #0 0x28a71d in __asan_register_globals (/home/arjun/llvm-project/build/tools/mlir/unittests/Support/MLIRSupportTests+0x28a71d) #1 0x7fbdf2061c4b in asan.module_ctor (/home/arjun/llvm-project/build/lib/libMLIRSupport.so.14git+0x11bc4b) ==102592==HINT: if you don't care about these errors you may set ASAN_OPTIONS=detect_odr_violation=0 SUMMARY AddressSanitizer: odr-violation: global 'vtable for mlir::raw_indented_ostream' at /home/arjun/llvm-project/mlir/lib/Support/IndentedOstream.cpp ==102592==ABORTING ``` Reviewed By: jpienaar Differential Revision: https://reviews.llvm.org/D116027
1 parent 46cdcf0 commit 0c553cc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

mlir/include/mlir/Support/DebugAction.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ template <typename... ParameterTs> class DebugAction {
205205

206206
/// Provide classof to allow casting between handler types.
207207
static bool classof(const DebugActionManager::HandlerBase *handler) {
208-
return handler->getHandlerID() ==
209-
TypeID::get<DebugAction<ParameterTs...>::Handler>();
208+
return handler->getHandlerID() == TypeID::get<Handler>();
210209
}
211210
};
212211

mlir/unittests/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ add_subdirectory(ExecutionEngine)
1111
add_subdirectory(Interfaces)
1212
add_subdirectory(IR)
1313
add_subdirectory(Pass)
14+
add_subdirectory(Support)
1415
add_subdirectory(Rewrite)
1516
add_subdirectory(TableGen)
1617
add_subdirectory(Transforms)

mlir/unittests/Support/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ add_mlir_unittest(MLIRSupportTests
77
)
88

99
target_link_libraries(MLIRSupportTests
10-
PRIVATE MLIRSupportIndentedOstream MLIRSupport)
10+
PRIVATE MLIRSupport)

0 commit comments

Comments
 (0)