This is an archive of the discontinued LLVM Phabricator instance.

Differential D35872

lld: /manifestuac:no shouldn't disable /manifestdependency:
ClosedPublic

Authored by thakis on Jul 25 2017, 6:50 PM.

Details

Reviewers
ruiu
Summary

Matches link.exe

Diff Detail

Event Timeline

thakis created this revision.Jul 25 2017, 6:50 PM
ruiu accepted this revision.Jul 25 2017, 7:44 PM

LGTM

This revision is now accepted and ready to land.Jul 25 2017, 7:44 PM
thakis closed this revision.Jul 26 2017, 4:38 PM

Thanks! r309231

Revision Contents

PathSize
COFF/
14 lines
test/
COFF/
16 lines

Diff 108201

COFF/DriverUtils.cpp

Show First 20 Lines • Show All 331 Lines • ▼ Show 20 Lines if (Config->ManifestUAC) {
OS << " <trustInfo>\n" OS << " <trustInfo>\n"
<< " <security>\n" << " <security>\n"
<< " <requestedPrivileges>\n" << " <requestedPrivileges>\n"
<< " <requestedExecutionLevel level=" << Config->ManifestLevel << " <requestedExecutionLevel level=" << Config->ManifestLevel
<< " uiAccess=" << Config->ManifestUIAccess << "/>\n" << " uiAccess=" << Config->ManifestUIAccess << "/>\n"
<< " </requestedPrivileges>\n" << " </requestedPrivileges>\n"
<< " </security>\n" << " </security>\n"
<< " </trustInfo>\n"; << " </trustInfo>\n";
}
if (!Config->ManifestDependency.empty()) { if (!Config->ManifestDependency.empty()) {
OS << " <dependency>\n" OS << " <dependency>\n"
<< " <dependentAssembly>\n" << " <dependentAssembly>\n"
<< " <assemblyIdentity " << Config->ManifestDependency << " />\n" << " <assemblyIdentity " << Config->ManifestDependency << " />\n"
<< " </dependentAssembly>\n" << " </dependentAssembly>\n"
<< " </dependency>\n"; << " </dependency>\n";
} }
}
OS << "</assembly>\n"; OS << "</assembly>\n";
OS.close(); OS.close();
return File; return File;
} }
static std::string readFile(StringRef Path) { static std::string readFile(StringRef Path) {
std::unique_ptr<MemoryBuffer> MB = std::unique_ptr<MemoryBuffer> MB =
check(MemoryBuffer::getFile(Path), "could not open " + Path); check(MemoryBuffer::getFile(Path), "could not open " + Path);
▲ Show 20 Lines • Show All 375 Lines • Show Last 20 Lines

test/COFF/manifest.test

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines
DEPENDENCY: </trustInfo> DEPENDENCY: </trustInfo>
DEPENDENCY: <dependency> DEPENDENCY: <dependency>
DEPENDENCY: <dependentAssembly> DEPENDENCY: <dependentAssembly>
DEPENDENCY: <assemblyIdentity foo='bar' /> DEPENDENCY: <assemblyIdentity foo='bar' />
DEPENDENCY: </dependentAssembly> DEPENDENCY: </dependentAssembly>
DEPENDENCY: </dependency> DEPENDENCY: </dependency>
DEPENDENCY: </assembly> 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 # RUN: FileCheck -check-prefix=NOUAC %s < %t.exe.manifest
NOUAC: <?xml version="1.0" standalone="yes"?> NOUAC: <?xml version="1.0" standalone="yes"?>
NOUAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1" NOUAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
NOUAC: manifestVersion="1.0"> NOUAC: manifestVersion="1.0">
NOUAC: <dependency>
NOUAC: <dependentAssembly>
NOUAC: <assemblyIdentity foo='bar' />
NOUAC: </dependentAssembly>
NOUAC: </dependency>
NOUAC: </assembly> 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>