From 1f3fedc01cc6e879dcfbf8846d4d1520deec849b Mon Sep 17 00:00:00 2001 From: Gheorghe-Teodor Bercea Date: Mon, 7 Aug 2017 18:43:37 +0000 Subject: [PATCH] Non-functional change. Fix previous patch D34784. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@310282 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Compilation.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index 6626662b9e..3ddd648fa1 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -60,11 +60,15 @@ Compilation::getArgsForToolChain(const ToolChain *TC, StringRef BoundArch, DerivedArgList *&Entry = TCArgs[{TC, BoundArch, DeviceOffloadKind}]; if (!Entry) { // Translate OpenMP toolchain arguments provided via the -Xopenmp-target flags. - Entry = TC->TranslateOpenMPTargetArgs(*TranslatedArgs, DeviceOffloadKind); - if (!Entry) - Entry = TranslatedArgs; + DerivedArgList *OpenMPArgs = TC->TranslateOpenMPTargetArgs(*TranslatedArgs, + DeviceOffloadKind); + if (!OpenMPArgs) { + Entry = TC->TranslateArgs(*TranslatedArgs, BoundArch, DeviceOffloadKind); + } else { + Entry = TC->TranslateArgs(*OpenMPArgs, BoundArch, DeviceOffloadKind); + delete OpenMPArgs; + } - Entry = TC->TranslateArgs(*Entry, BoundArch, DeviceOffloadKind); if (!Entry) Entry = TranslatedArgs; } -- 2.40.0