[PATCH] D35872: lld: /manifestuac:no shouldn't disable /manifestdependency:

[Nico Weber via Phabricator via llvm-commits]

thakis created this revision.

Matches link.exe


https://reviews.llvm.org/D35872

Files:
  COFF/DriverUtils.cpp
  test/COFF/manifest.test


Index: test/COFF/manifest.test
===================================================================
--- test/COFF/manifest.test
+++ test/COFF/manifest.test
@@ -57,10 +57,24 @@
 DEPENDENCY:   </dependency>
 DEPENDENCY: </assembly>
 
-# RUN: lld-link /manifest /out:%t.exe /entry:main /manifestuac:no %t.obj
+# RUN: lld-link /manifest /out:%t.exe /entry:main /manifestuac:no \
+# RUN:   /manifestdependency:"foo='bar'" %t.obj
 # RUN: FileCheck -check-prefix=NOUAC %s < %t.exe.manifest
 
 NOUAC: <?xml version="1.0" standalone="yes"?>
 NOUAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
 NOUAC:           manifestVersion="1.0">
+NOUAC:   <dependency>
+NOUAC:     <dependentAssembly>
+NOUAC:       <assemblyIdentity foo='bar' />
+NOUAC:     </dependentAssembly>
+NOUAC:   </dependency>
 NOUAC: </assembly>
+
+# RUN: lld-link /manifest /out:%t.exe /entry:main /manifestuac:no %t.obj
+# RUN: FileCheck -check-prefix=NOUACNODEP %s < %t.exe.manifest
+
+NOUACNODEP: <?xml version="1.0" standalone="yes"?>
+NOUACNODEP: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+NOUACNODEP:           manifestVersion="1.0">
+NOUACNODEP: </assembly>
Index: COFF/DriverUtils.cpp
===================================================================
--- COFF/DriverUtils.cpp
+++ COFF/DriverUtils.cpp
@@ -337,13 +337,13 @@
        << "      </requestedPrivileges>\n"
        << "    </security>\n"
        << "  </trustInfo>\n";
-    if (!Config->ManifestDependency.empty()) {
-      OS << "  <dependency>\n"
-         << "    <dependentAssembly>\n"
-         << "      <assemblyIdentity " << Config->ManifestDependency << " />\n"
-         << "    </dependentAssembly>\n"
-         << "  </dependency>\n";
-    }
+  }
+  if (!Config->ManifestDependency.empty()) {
+    OS << "  <dependency>\n"
+       << "    <dependentAssembly>\n"
+       << "      <assemblyIdentity " << Config->ManifestDependency << " />\n"
+       << "    </dependentAssembly>\n"
+       << "  </dependency>\n";
   }
   OS << "</assembly>\n";
   OS.close();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35872.108201.patch
Type: text/x-patch
Size: 2013 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170726/b4ad33f2/attachment.bin>