[SYCL][NFC] Code clean up (phase 4) revealed by self build. #2878
Conversation
| @@ -235,7 +235,7 @@ struct TformCmd { | |||
|
|
|||
| #define CHECK_AND_EXIT(E) \ | |||
| { \ | |||
| Error LocE = std::move(E); \ | |||
| Error LocE = E; \ | |||
There was a problem hiding this comment.
aren't old and new variants equivalent (taking into account CHECK_AND_EXIT caller sites)? What problem does this change solve?
There was a problem hiding this comment.
This is the error I was trying to fix:
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(277,9): error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move]
CHECK_AND_EXIT(Cmd.takeError());
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(238,18): note: expanded from macro 'CHECK_AND_EXIT'
Error LocE = std::move(E);
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(288,5): error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move]
CHECK_AND_EXIT(makeUserError("no inputs"));
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(238,18): note: expanded from macro 'CHECK_AND_EXIT'
Error LocE = std::move(E);
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(303,5): error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move]
CHECK_AND_EXIT(Table.takeError());
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(238,18): note: expanded from macro 'CHECK_AND_EXIT'
Error LocE = std::move(E);
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(315,5): error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move]
CHECK_AND_EXIT(createFileError(Output, EC));
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(238,18): note: expanded from macro 'CHECK_AND_EXIT'
Error LocE = std::move(E);
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(319,5): error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move]
CHECK_AND_EXIT(createFileError(Output, Out.error()));
^
D:/IUSERS/zahiraam/xmain_ws/xmain_self_build/llvm/llvm/tools/file-table-tform/file-table-tform.cpp(238,18): note: expanded from macro 'CHECK_AND_EXIT'
Error LocE = std::move(E);
^
5 errors generated.
There was a problem hiding this comment.
Oh, right. I was looking at the call sites that are changed and could not see the temp. I should've looked to all other call sites instead.
| @@ -235,7 +235,7 @@ struct TformCmd { | |||
|
|
|||
| #define CHECK_AND_EXIT(E) \ | |||
| { \ | |||
| Error LocE = std::move(E); \ | |||
| Error LocE = E; \ | |||
There was a problem hiding this comment.
Oh, right. I was looking at the call sites that are changed and could not see the temp. I should've looked to all other call sites instead.
|
@smaslov-intel Can you please review? Thanks. |
|
@romanovvlad, is this something you can help merge? Thanks! |
* upstream/sycl: (616 commits) [SYCL][L0] Implement robust error handling in level_zero plugin (intel#2870) [SYCL][NFC] Code clean up (phase 5) revealed by self build. (intel#2907) [Driver][NFC] Remove unused variable (intel#2908) [Github Action] Enable automatic sync for main branch from llvm-project to llvm (intel#2904) [ESIMD][NFC] Remove unnecessary macro checks (intel#2900) [SYCL] Fix handling of multiple usages of composite spec constants (intel#2894) [SYCL] Adjust parallel-for range global size to improve group size selection (intel#2703) [SYCL] Add template parameter support for no_global_work_offset attribute (intel#2839) [SYCL] Support LLVM FP intrinsic in llvm-spirv and FE (intel#2880) [SYCL]Link Libm FP64 SYCL device library by default (intel#2892) [SYCL][NFC] Code clean up (phase 4) revealed by self build. (intel#2878) [SYCL][NFC] Code clean up (phase 3) revealed by self build. (intel#2865) [SYCL] Fix backend selection for SYCL_DEVICE_TYPE=* (intel#2890) [SYCL] Fix spec constants support in integration header (intel#2896) [Driver] Update unbundling of offload libraries to use archive type (intel#2883) [SYCL][NFC] Clang format SYCL.cpp (intel#2891) [CODEOWNERS] Add code owners for DPC++ tools (intel#2884) [XPTIFW] Enable in-tree builds (intel#2849) [SYCL] Don't dump IR and dot files by default in the LowerWGScope pass (intel#2887) [SYCL] Use llvm-link's only-needed option to link device libs (intel#2783) ...
No description provided.