<div dir="auto"><div>When you revert a patch (even one of your own), please say why you reverted it in the commit message.<br><div class="gmail_extra"><br><div class="gmail_quote">On 11 May 2017 1:38 am, "Serge Pavlov via cfe-commits" <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: sepavloff<br>
Date: Thu May 11 03:25:22 2017<br>
New Revision: 302777<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=302777&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=302777&view=rev</a><br>
Log:<br>
Reverted r302775<br>
<br>
Added:<br>
cfe/trunk/test/Driver/arm-<wbr>darwin-builtin.c<br>
- copied unchanged from r302774, cfe/trunk/test/Driver/arm-<wbr>darwin-builtin.c<br>
Modified:<br>
cfe/trunk/lib/Driver/Driver.<wbr>cpp<br>
cfe/trunk/test/Driver/aarch64-<wbr>cpus.c<br>
cfe/trunk/test/Driver/amdgpu-<wbr>features.c<br>
cfe/trunk/test/Driver/arm-<wbr>default-build-attributes.s<br>
cfe/trunk/test/Driver/cl-<wbr>outputs.c<br>
cfe/trunk/test/Driver/clang_f_<wbr>opts.c<br>
cfe/trunk/test/Driver/<a href="http://cuda-external-tools.cu" rel="noreferrer" target="_blank">cuda-<wbr>external-tools.cu</a><br>
cfe/trunk/test/Driver/debug-<wbr>options.c<br>
cfe/trunk/test/Driver/<wbr>gfortran.f90<br>
cfe/trunk/test/Driver/split-<wbr>debug.h<br>
cfe/trunk/test/Driver/unknown-<wbr>arg.c<br>
cfe/trunk/test/Index/index-<wbr>attrs.c<br>
cfe/trunk/test/Index/index-<wbr>attrs.cpp<br>
cfe/trunk/tools/driver/driver.<wbr>cpp<br>
<br>
Modified: cfe/trunk/lib/Driver/Driver.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>Driver.cpp?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/Driver.<wbr>cpp (original)<br>
+++ cfe/trunk/lib/Driver/Driver.<wbr>cpp Thu May 11 03:25:22 2017<br>
@@ -598,8 +598,6 @@ Compilation *Driver::BuildCompilation(Ar<br>
bool CCCPrintPhases;<br>
<br>
InputArgList Args = ParseArgStrings(ArgList.slice(<wbr>1));<br>
- if (Diags.hasErrorOccurred())<br>
- return nullptr;<br>
<br>
// Silence driver warnings if requested<br>
Diags.setIgnoreAllWarnings(<wbr>Args.hasArg(options::OPT_w));<br>
<br>
Modified: cfe/trunk/test/Driver/aarch64-<wbr>cpus.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/aarch64-cpus.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>aarch64-cpus.c?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/aarch64-<wbr>cpus.c (original)<br>
+++ cfe/trunk/test/Driver/aarch64-<wbr>cpus.c Thu May 11 03:25:22 2017<br>
@@ -11,7 +11,7 @@<br>
// RUN: %clang -target arm64 -### -c %s 2>&1 | FileCheck -check-prefix=ARM64-GENERIC %s<br>
// RUN: %clang -target arm64 -mcpu=generic -### -c %s 2>&1 | FileCheck -check-prefix=ARM64-GENERIC %s<br>
// RUN: %clang -target arm64 -mlittle-endian -### -c %s 2>&1 | FileCheck -check-prefix=ARM64-GENERIC %s<br>
-// RUN: %clang -target arm64 -mlittle-endian -mcpu=generic -### -c %s 2>&1 | FileCheck -check-prefix=ARM64-GENERIC %s<br>
+// RUN: %clang -target arm64 -mlittle-endian -mcpu-generic -### -c %s 2>&1 | FileCheck -check-prefix=ARM64-GENERIC %s<br>
<br>
// ARM64-GENERIC: "-cc1"{{.*}} "-triple" "arm64{{.*}}" "-target-cpu" "generic"<br>
<br>
<br>
Modified: cfe/trunk/test/Driver/amdgpu-<wbr>features.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/amdgpu-features.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>amdgpu-features.c?rev=302777&<wbr>r1=302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/amdgpu-<wbr>features.c (original)<br>
+++ cfe/trunk/test/Driver/amdgpu-<wbr>features.c Thu May 11 03:25:22 2017<br>
@@ -1,7 +1,7 @@<br>
-// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=kaveri -mamdgpu-debugger-abi=0.0 %s -o - 2>&1 \<br>
+// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=kaveri -mamdgpu-debugger-abi=0.0 %s -o 2>&1 \<br>
// RUN: | FileCheck --check-prefix=CHECK-MAMDGPU-<wbr>DEBUGGER-ABI-0-0 %s<br>
// CHECK-MAMDGPU-DEBUGGER-ABI-0-<wbr>0: the clang compiler does not support '-mamdgpu-debugger-abi=0.0'<br>
<br>
-// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=kaveri -mamdgpu-debugger-abi=1.0 %s -o - 2>&1 \<br>
+// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=kaveri -mamdgpu-debugger-abi=1.0 %s -o 2>&1 \<br>
// RUN: | FileCheck --check-prefix=CHECK-MAMDGPU-<wbr>DEBUGGER-ABI-1-0 %s<br>
// CHECK-MAMDGPU-DEBUGGER-ABI-1-<wbr>0: "-target-feature" "+amdgpu-debugger-insert-nops" "-target-feature" "+amdgpu-debugger-reserve-<wbr>regs" "-target-feature" "+amdgpu-debugger-emit-<wbr>prologue"<br>
<br>
Modified: cfe/trunk/test/Driver/arm-<wbr>default-build-attributes.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-default-build-attributes.s?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>arm-default-build-attributes.<wbr>s?rev=302777&r1=302776&r2=<wbr>302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/arm-<wbr>default-build-attributes.s (original)<br>
+++ cfe/trunk/test/Driver/arm-<wbr>default-build-attributes.s Thu May 11 03:25:22 2017<br>
@@ -10,9 +10,9 @@<br>
<br>
// Option ignored C/C++ (since we always emit hardware and ABI build attributes<br>
// during codegen).<br>
-// RUN: %clang -target armv7--none-eabi -### -x c %s -mdefault-build-attributes 2>&1 \<br>
+// RUN: %clang -target armv7--none-eabi -### -x c %s -mdefault-build-attributes -verify 2>&1 \<br>
// RUN: | FileCheck %s -check-prefix CHECK-DISABLED<br>
-// RUN: %clang -target armv7--none-eabi -### -x c++ %s -mdefault-build-attributes 2>&1 \<br>
+// RUN: %clang -target armv7--none-eabi -### -x c++ %s -mdefault-build-attributes -verify 2>&1 \<br>
// RUN: | FileCheck %s -check-prefix CHECK-DISABLED<br>
<br>
// CHECK-DISABLED-NOT: "-arm-add-build-attributes"<br>
<br>
Modified: cfe/trunk/test/Driver/cl-<wbr>outputs.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cl-outputs.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>cl-outputs.c?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/cl-<wbr>outputs.c (original)<br>
+++ cfe/trunk/test/Driver/cl-<wbr>outputs.c Thu May 11 03:25:22 2017<br>
@@ -73,7 +73,7 @@<br>
// RUN: %clang_cl /c /o .. -### -- %s 2>&1 | FileCheck -check-prefix=oCRAZY2 %s<br>
// oCRAZY2: "-o" "..obj"<br>
<br>
-// RUN: not %clang_cl /c %s -### /o 2>&1 | FileCheck -check-prefix=oMISSINGARG %s<br>
+// RUN: %clang_cl /c %s -### /o 2>&1 | FileCheck -check-prefix=oMISSINGARG %s<br>
// oMISSINGARG: error: argument to '/o' is missing (expected 1 value)<br>
<br>
// RUN: %clang_cl /c /omydir/ -### -- %s %s 2>&1 | FileCheck -check-prefix=CHECK-<wbr>oMULTIPLESOURCEOK1 %s<br>
@@ -208,7 +208,7 @@<br>
// FeoDIRNAMEEXTDLL: "-out:foo.dir{{[/\\]+}}a.ext"<br>
// FeoDIRNAMEEXTDLL: "-implib:foo.dir{{[/\\]+}}a.<wbr>lib"<br>
<br>
-// RUN: not %clang_cl -### /o 2>&1 | FileCheck -check-prefix=FeoMISSINGARG %s<br>
+// RUN: %clang_cl -### /o 2>&1 | FileCheck -check-prefix=FeoMISSINGARG %s<br>
// FeoMISSINGARG: error: argument to '/o' is missing (expected 1 value)<br>
<br>
// RUN: %clang_cl /ofoo /o bar -### -- %s 2>&1 | FileCheck -check-prefix=FeoOVERRIDE %s<br>
<br>
Modified: cfe/trunk/test/Driver/clang_f_<wbr>opts.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/clang_f_opts.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>clang_f_opts.c?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/clang_f_<wbr>opts.c (original)<br>
+++ cfe/trunk/test/Driver/clang_f_<wbr>opts.c Thu May 11 03:25:22 2017<br>
@@ -186,7 +186,7 @@<br>
// CHECK-NO-SLP-VECTORIZE-AGG-<wbr>NOT: "-vectorize-slp-aggressive"<br>
<br>
// RUN: %clang -### -S -fextended-identifiers %s 2>&1 | FileCheck -check-prefix=CHECK-EXTENDED-<wbr>IDENTIFIERS %s<br>
-// RUN: not %clang -### -S -fno-extended-identifiers %s 2>&1 | FileCheck -check-prefix=CHECK-NO-<wbr>EXTENDED-IDENTIFIERS %s<br>
+// RUN: %clang -### -S -fno-extended-identifiers %s 2>&1 | FileCheck -check-prefix=CHECK-NO-<wbr>EXTENDED-IDENTIFIERS %s<br>
// CHECK-EXTENDED-IDENTIFIERS: "-cc1"<br>
// CHECK-EXTENDED-IDENTIFIERS-<wbr>NOT: "-fextended-identifiers"<br>
// CHECK-NO-EXTENDED-IDENTIFIERS: error: unsupported option '-fno-extended-identifiers'<br>
<br>
Modified: cfe/trunk/test/Driver/<a href="http://cuda-external-tools.cu" rel="noreferrer" target="_blank">cuda-<wbr>external-tools.cu</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cuda-external-tools.cu?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>cuda-external-tools.cu?rev=<wbr>302777&r1=302776&r2=302777&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/<a href="http://cuda-external-tools.cu" rel="noreferrer" target="_blank">cuda-<wbr>external-tools.cu</a> (original)<br>
+++ cfe/trunk/test/Driver/<a href="http://cuda-external-tools.cu" rel="noreferrer" target="_blank">cuda-<wbr>external-tools.cu</a> Thu May 11 03:25:22 2017<br>
@@ -24,8 +24,8 @@<br>
// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix DBG %s<br>
<br>
// --no-cuda-noopt-device-debug overrides --cuda-noopt-device-debug.<br>
-// RUN: %clang -### -target x86_64-linux-gnu --cuda-noopt-device-debug \<br>
-// RUN: --no-cuda-noopt-device-debug -O2 -c %s 2>&1 \<br>
+// RUN: %clang -### -target x86_64-linux-gnu --cuda-noopt-debug \<br>
+// RUN: --no-cuda-noopt-debug -O2 -c %s 2>&1 \<br>
// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT2 %s<br>
<br>
// Regular compile without -O. This should result in us passing -O0 to ptxas.<br>
<br>
Modified: cfe/trunk/test/Driver/debug-<wbr>options.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/debug-options.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>debug-options.c?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/debug-<wbr>options.c (original)<br>
+++ cfe/trunk/test/Driver/debug-<wbr>options.c Thu May 11 03:25:22 2017<br>
@@ -80,7 +80,7 @@<br>
// RUN: %clang -### -c -gdwarf-2 %s 2>&1 \<br>
// RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s<br>
//<br>
-// RUN: not %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=G_ERR %s<br>
+// RUN: %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=G_NO %s<br>
// RUN: %clang -### -c -g -g0 %s 2>&1 | FileCheck -check-prefix=G_NO %s<br>
// RUN: %clang -### -c -ggdb0 %s 2>&1 | FileCheck -check-prefix=G_NO %s<br>
// RUN: %clang -### -c -glldb -g0 %s 2>&1 | FileCheck -check-prefix=G_NO %s<br>
@@ -171,8 +171,6 @@<br>
// G_PS4: "-dwarf-version=<br>
// G_PS4: "-generate-arange-section"<br>
//<br>
-// G_ERR: error: unknown argument:<br>
-//<br>
// G_NO: "-cc1"<br>
// G_NO-NOT: -debug-info-kind=<br>
//<br>
<br>
Modified: cfe/trunk/test/Driver/<wbr>gfortran.f90<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/gfortran.f90?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>gfortran.f90?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/<wbr>gfortran.f90 (original)<br>
+++ cfe/trunk/test/Driver/<wbr>gfortran.f90 Thu May 11 03:25:22 2017<br>
@@ -106,6 +106,7 @@<br>
! RUN: -fsyntax-only \<br>
! RUN: -funderscoring \<br>
! RUN: -fwhole-file \<br>
+! RUN: -fworking-directory \<br>
! RUN: -imultilib \<br>
! RUN: -iprefix \<br>
! RUN: -iquote \<br>
@@ -225,6 +226,7 @@<br>
! CHECK: "-fstack-arrays"<br>
! CHECK: "-funderscoring"<br>
! CHECK: "-fwhole-file"<br>
+! CHECK: "-fworking-directory"<br>
! CHECK: "-imultilib"<br>
! CHECK: "-iprefix"<br>
! CHECK: "-iquote"<br>
<br>
Modified: cfe/trunk/test/Driver/split-<wbr>debug.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/split-debug.h?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>split-debug.h?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/split-<wbr>debug.h (original)<br>
+++ cfe/trunk/test/Driver/split-<wbr>debug.h Thu May 11 03:25:22 2017<br>
@@ -3,4 +3,13 @@<br>
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -c -fmodules -### %s 2> %t<br>
// RUN: FileCheck -check-prefix=CHECK-NO-ACTIONS < %t %s<br>
//<br>
+// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -c -fmodules -emit-module -fmodules-embed-all-files -fno-implicit-modules -fno-implicit-module-maps -### %s 2> %t<br>
+// RUN: FileCheck -check-prefix=CHECK-NO-ACTIONS < %t %s<br>
+//<br>
+// FIXME: This should fail using clang, except that the type of the output for<br>
+// an object output with modules is given as clang::driver::types::TY_PCH<br>
+// rather than TY_Object.<br>
+// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -c -fmodules -fmodule-format=obj -### %s 2> %t<br>
+// RUN: FileCheck -check-prefix=CHECK-NO-ACTIONS < %t %s<br>
+//<br>
// CHECK-NO-ACTIONS-NOT: objcopy<br>
<br>
Modified: cfe/trunk/test/Driver/unknown-<wbr>arg.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/unknown-arg.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>unknown-arg.c?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/unknown-<wbr>arg.c (original)<br>
+++ cfe/trunk/test/Driver/unknown-<wbr>arg.c Thu May 11 03:25:22 2017<br>
@@ -1,8 +1,8 @@<br>
-// RUN: not %clang %s -cake-is-lie -%0 -%d -HHHH -munknown-to-clang-option -print-stats -funknown-to-clang-option -### 2>&1 | \<br>
+// RUN: %clang %s -cake-is-lie -%0 -%d -HHHH -munknown-to-clang-option -print-stats -funknown-to-clang-option -### 2>&1 | \<br>
// RUN: FileCheck %s<br>
// RUN: %clang_cl -cake-is-lie -%0 -%d -HHHH -munknown-to-clang-option -print-stats -funknown-to-clang-option -### -c -- %s 2>&1 | \<br>
// RUN: FileCheck %s --check-prefix=CL<br>
-// RUN: not %clang_cl -cake-is-lie -%0 -%d -HHHH -munknown-to-clang-option -print-stats -funknown-to-clang-option -c -Werror=unknown-argument -### -- %s 2>&1 | \<br>
+// RUN: %clang_cl -cake-is-lie -%0 -%d -HHHH -munknown-to-clang-option -print-stats -funknown-to-clang-option -c -Werror=unknown-argument -### -- %s 2>&1 | \<br>
// RUN: FileCheck %s --check-prefix=CL-ERROR<br>
// RUN: %clang_cl -cake-is-lie -%0 -%d -HHHH -munknown-to-clang-option -print-stats -funknown-to-clang-option -c -Wno-unknown-argument -### -- %s 2>&1 | \<br>
// RUN: FileCheck %s --check-prefix=SILENT<br>
<br>
Modified: cfe/trunk/test/Index/index-<wbr>attrs.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-attrs.c?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Index/<wbr>index-attrs.c?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Index/index-<wbr>attrs.c (original)<br>
+++ cfe/trunk/test/Index/index-<wbr>attrs.c Thu May 11 03:25:22 2017<br>
@@ -1,16 +1,16 @@<br>
-// RUN: c-index-test -index-file %s -target armv7-windows-gnu -fdeclspec 2>&1 | FileCheck %s<br>
+// RUN: c-index-test -index-file -check-prefix CHECK %s -target armv7-windows-gnu -fdeclspec<br>
<br>
void __declspec(dllexport) export_function(void) {}<br>
-// CHECK: [indexDeclaration]: kind: function | name: export_function | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaraton]: kind: function | name: export_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllexport)<br>
void __attribute__((dllexport)) export_gnu_attribute(void) {}<br>
-// CHECK: [indexDeclaration]: kind: function | name: export_gnu_attribute | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaration] kind: function | name: export_gnu_attribute | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllexport)<br>
<br>
void __declspec(dllimport) import_function(void);<br>
-// CHECK: [indexDeclaration]: kind: function | name: import_function | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaration] kind: function | name: import_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllimport)<br>
void __attribute__((dllimport)) import_gnu_attribute(void);<br>
-// CHECK: [indexDeclaration]: kind: function | name: import_gnu_attribute | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaration] kind: function | name: import_gnu_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllimport)<br>
<br>
<br>
Modified: cfe/trunk/test/Index/index-<wbr>attrs.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-attrs.cpp?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Index/<wbr>index-attrs.cpp?rev=302777&r1=<wbr>302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Index/index-<wbr>attrs.cpp (original)<br>
+++ cfe/trunk/test/Index/index-<wbr>attrs.cpp Thu May 11 03:25:22 2017<br>
@@ -1,4 +1,4 @@<br>
-// RUN: c-index-test -index-file %s -target armv7-windows-gnu -fdeclspec | FileCheck %s<br>
+// RUN: c-index-test -index-file -check-prefix CHECK %s -target armv7-windows-gnu -fdeclspec<br>
<br>
struct __declspec(dllexport) export_s {<br>
void m();<br>
@@ -19,7 +19,7 @@ struct __declspec(dllimport) import_s {<br>
class __attribute__((dllexport)) export_gnu_s {<br>
void m();<br>
};<br>
-// CHECK: [indexDeclaration]: kind: c++-class | name: export_gnu_s | {{.*}} | lang: C++<br>
+// CHECK: [indexDeclaration]: kind: struct | name: export_gnu_s | {{.*}} | lang: C++<br>
// CHECK: <attribute>: attribute(dllexport)<br>
// CHECK: [indexDeclaration]: kind: c++-instance-method | name: m | {{.*}} | lang: C++<br>
// CHECK: <attribute>: attribute(dllexport)<br>
@@ -27,24 +27,24 @@ class __attribute__((dllexport)) export_<br>
class __attribute__((dllimport)) import_gnu_s {<br>
void m();<br>
};<br>
-// CHECK: [indexDeclaration]: kind: c++-class | name: import_gnu_s | {{.*}} | lang: C++<br>
+// CHECK: [indexDeclaration]: kind: struct | name: import_gnu_s | {{.*}} | lang: C++<br>
// CHECK: <attribute>: attribute(dllimport)<br>
// CHECK: [indexDeclaration]: kind: c++-instance-method | name: m | {{.*}} | lang: C++<br>
// CHECK: <attribute>: attribute(dllimport)<br>
<br>
extern "C" void __declspec(dllexport) export_function(void) {}<br>
-// CHECK: [indexDeclaration]: kind: function | name: export_function | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaraton]: kind: function | name: export_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllexport)<br>
extern "C" void __attribute__((dllexport)) export_gnu_function(void) {}<br>
-// CHECK: [indexDeclaration]: kind: function | name: export_gnu_function | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaraton]: kind: function | name: export_gnu_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllexport)<br>
<br>
extern "C" {<br>
void __declspec(dllimport) import_function(void);<br>
-// CHECK: [indexDeclaration]: kind: function | name: import_function | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaration] kind: function | name: import_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllimport)<br>
void __attribute__((dllimport)) import_gnu_function(void);<br>
-// CHECK: [indexDeclaration]: kind: function | name: import_gnu_function | {{.*}} | lang: C<br>
+// CHECK: [indexDeclaration] kind: function | name: import_gnu_function | {{.*}} | lang: C<br>
// CHECK: <attribute>: attribute(dllimport)<br>
}<br>
<br>
<br>
Modified: cfe/trunk/tools/driver/driver.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=302777&r1=302776&r2=302777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/tools/<wbr>driver/driver.cpp?rev=302777&<wbr>r1=302776&r2=302777&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/tools/driver/driver.<wbr>cpp (original)<br>
+++ cfe/trunk/tools/driver/driver.<wbr>cpp Thu May 11 03:25:22 2017<br>
@@ -454,41 +454,40 @@ int main(int argc_, const char **argv_)<br>
SetBackdoorDriverOutputsFromEn<wbr>vVars(TheDriver);<br>
<br>
std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(<wbr>argv));<br>
- int Res = 1;<br>
- if (C.get()) {<br>
- SmallVector<std::pair<int, const Command *>, 4> FailingCommands;<br>
+ int Res = 0;<br>
+ SmallVector<std::pair<int, const Command *>, 4> FailingCommands;<br>
+ if (C.get())<br>
Res = TheDriver.ExecuteCompilation(*<wbr>C, FailingCommands);<br>
<br>
- // Force a crash to test the diagnostics.<br>
- if (TheDriver.GenReproducer) {<br>
- Diags.Report(diag::err_drv_<wbr>force_crash)<br>
+ // Force a crash to test the diagnostics.<br>
+ if (TheDriver.GenReproducer) {<br>
+ Diags.Report(diag::err_drv_<wbr>force_crash)<br>
<< !::getenv("FORCE_CLANG_<wbr>DIAGNOSTICS_CRASH");<br>
<br>
- // Pretend that every command failed.<br>
- FailingCommands.clear();<br>
- for (const auto &J : C->getJobs())<br>
- if (const Command *C = dyn_cast<Command>(&J))<br>
- FailingCommands.push_back(std:<wbr>:make_pair(-1, C));<br>
- }<br>
+ // Pretend that every command failed.<br>
+ FailingCommands.clear();<br>
+ for (const auto &J : C->getJobs())<br>
+ if (const Command *C = dyn_cast<Command>(&J))<br>
+ FailingCommands.push_back(std:<wbr>:make_pair(-1, C));<br>
+ }<br>
<br>
- for (const auto &P : FailingCommands) {<br>
- int CommandRes = P.first;<br>
- const Command *FailingCommand = P.second;<br>
- if (!Res)<br>
- Res = CommandRes;<br>
-<br>
- // If result status is < 0, then the driver command signalled an error.<br>
- // If result status is 70, then the driver command reported a fatal error.<br>
- // On Windows, abort will return an exit code of 3. In these cases,<br>
- // generate additional diagnostic information if possible.<br>
- bool DiagnoseCrash = CommandRes < 0 || CommandRes == 70;<br>
+ for (const auto &P : FailingCommands) {<br>
+ int CommandRes = P.first;<br>
+ const Command *FailingCommand = P.second;<br>
+ if (!Res)<br>
+ Res = CommandRes;<br>
+<br>
+ // If result status is < 0, then the driver command signalled an error.<br>
+ // If result status is 70, then the driver command reported a fatal error.<br>
+ // On Windows, abort will return an exit code of 3. In these cases,<br>
+ // generate additional diagnostic information if possible.<br>
+ bool DiagnoseCrash = CommandRes < 0 || CommandRes == 70;<br>
#ifdef LLVM_ON_WIN32<br>
- DiagnoseCrash |= CommandRes == 3;<br>
+ DiagnoseCrash |= CommandRes == 3;<br>
#endif<br>
- if (DiagnoseCrash) {<br>
- TheDriver.<wbr>generateCompilationDiagnostics<wbr>(*C, *FailingCommand);<br>
- break;<br>
- }<br>
+ if (DiagnoseCrash) {<br>
+ TheDriver.<wbr>generateCompilationDiagnostics<wbr>(*C, *FailingCommand);<br>
+ break;<br>
}<br>
}<br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div></div>