Skip to content

Conversation

@kazutakahirata
Copy link
Contributor

No description provided.

@llvmbot
Copy link
Member

llvmbot commented May 6, 2025

@llvm/pr-subscribers-platform-windows

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/138641.diff

1 Files Affected:

  • (modified) lld/COFF/DriverUtils.cpp (+2-2)
diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index 664d1747e9cbd..b6334406035ac 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -417,7 +417,7 @@ LinkerDriver::createManifestXmlWithInternalMt(StringRef defaultXml) {
       MemoryBuffer::getMemBufferCopy(defaultXml);
 
   windows_manifest::WindowsManifestMerger merger;
-  if (auto e = merger.merge(*defaultXmlCopy.get()))
+  if (auto e = merger.merge(*defaultXmlCopy))
     Fatal(ctx) << "internal manifest tool failed on default xml: "
                << toString(std::move(e));
 
@@ -430,7 +430,7 @@ LinkerDriver::createManifestXmlWithInternalMt(StringRef defaultXml) {
                  << toString(std::move(e));
   }
 
-  return std::string(merger.getMergedManifest().get()->getBuffer());
+  return std::string(merger.getMergedManifest()->getBuffer());
 }
 
 std::string

@llvmbot
Copy link
Member

llvmbot commented May 6, 2025

@llvm/pr-subscribers-lld

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/138641.diff

1 Files Affected:

  • (modified) lld/COFF/DriverUtils.cpp (+2-2)
diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index 664d1747e9cbd..b6334406035ac 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -417,7 +417,7 @@ LinkerDriver::createManifestXmlWithInternalMt(StringRef defaultXml) {
       MemoryBuffer::getMemBufferCopy(defaultXml);
 
   windows_manifest::WindowsManifestMerger merger;
-  if (auto e = merger.merge(*defaultXmlCopy.get()))
+  if (auto e = merger.merge(*defaultXmlCopy))
     Fatal(ctx) << "internal manifest tool failed on default xml: "
                << toString(std::move(e));
 
@@ -430,7 +430,7 @@ LinkerDriver::createManifestXmlWithInternalMt(StringRef defaultXml) {
                  << toString(std::move(e));
   }
 
-  return std::string(merger.getMergedManifest().get()->getBuffer());
+  return std::string(merger.getMergedManifest()->getBuffer());
 }
 
 std::string

@llvmbot
Copy link
Member

llvmbot commented May 6, 2025

@llvm/pr-subscribers-lld-coff

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/138641.diff

1 Files Affected:

  • (modified) lld/COFF/DriverUtils.cpp (+2-2)
diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index 664d1747e9cbd..b6334406035ac 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -417,7 +417,7 @@ LinkerDriver::createManifestXmlWithInternalMt(StringRef defaultXml) {
       MemoryBuffer::getMemBufferCopy(defaultXml);
 
   windows_manifest::WindowsManifestMerger merger;
-  if (auto e = merger.merge(*defaultXmlCopy.get()))
+  if (auto e = merger.merge(*defaultXmlCopy))
     Fatal(ctx) << "internal manifest tool failed on default xml: "
                << toString(std::move(e));
 
@@ -430,7 +430,7 @@ LinkerDriver::createManifestXmlWithInternalMt(StringRef defaultXml) {
                  << toString(std::move(e));
   }
 
-  return std::string(merger.getMergedManifest().get()->getBuffer());
+  return std::string(merger.getMergedManifest()->getBuffer());
 }
 
 std::string

@kazutakahirata kazutakahirata merged commit dd3f6a3 into llvm:main May 6, 2025
15 checks passed
@kazutakahirata kazutakahirata deleted the cleanup_clang_tidy_readability_redundant_smartptr_get_lld branch May 6, 2025 14:56
GeorgeARM pushed a commit to GeorgeARM/llvm-project that referenced this pull request May 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants