diff options
| author | Alexey Bataev <a.bataev@hotmail.com> | 2018-09-25 18:31:56 +0000 |
|---|---|---|
| committer | Alexey Bataev <a.bataev@hotmail.com> | 2018-09-25 18:31:56 +0000 |
| commit | 3dfc9934375c0a3921c5275010e22ae58ddff16b (patch) | |
| tree | 16ff72656f42fb395257bf6e317e2f11806b73b4 /clang/lib/Driver | |
| parent | 0ec3185db907b452e394c20c83612e2f77b4b3d8 (diff) | |
| download | bcm5719-llvm-3dfc9934375c0a3921c5275010e22ae58ddff16b.tar.gz bcm5719-llvm-3dfc9934375c0a3921c5275010e22ae58ddff16b.zip | |
Revert "[DRIVER][OFFLOAD] Do not invoke unbundler on unsupported file
types."
It reverts commit r342991 + several other commits intended to fix the
tests. Still have some failed tests, need to investigate it.
llvm-svn: 343002
Diffstat (limited to 'clang/lib/Driver')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 0b74bbf6df3..81369f995da 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -2559,8 +2559,6 @@ class OffloadingActionBuilder final { getDeviceDependences(OffloadAction::DeviceDependences &DA, phases::ID CurPhase, phases::ID FinalPhase, PhasesTy &Phases) override { - if (OpenMPDeviceActions.empty()) - return ABRT_Inactive; // We should always have an action for each input. assert(OpenMPDeviceActions.size() == ToolChains.size() && @@ -2819,16 +2817,6 @@ public: if (CanUseBundler && isa<InputAction>(HostAction) && InputArg->getOption().getKind() == llvm::opt::Option::InputClass && !types::isSrcFile(HostAction->getType())) { - StringRef FileName = InputArg->getAsString(C.getArgs()); - // Check if the type of the file is the same as the action. Do not - // unbundle it if it is not. Do not unbundle .so files, for example, which - // are not object files. - if (HostAction->getType() == types::TY_Object && - llvm::sys::path::has_extension(FileName) && - types::lookupTypeForExtension( - llvm::sys::path::extension(FileName).drop_front()) != - HostAction->getType()) - return false; auto UnbundlingHostAction = C.MakeAction<OffloadUnbundlingJobAction>(HostAction); UnbundlingHostAction->registerDependentActionInfo( |

