From 8432f0d2fc8782d63ff2e234b44fc3585fd4921b Mon Sep 17 00:00:00 2001
From: Andrew Au <andrewau@microsoft.com>
Date: Wed, 3 Jul 2024 15:57:58 -0700
Subject: [PATCH] Fix the build for FEATURE_GDBJIT (#104380)

---
 src/coreclr/vm/callconvbuilder.cpp | 4 ++--
 src/coreclr/vm/customattribute.cpp | 2 +-
 src/coreclr/vm/customattribute.h   | 2 +-
 src/coreclr/vm/gdbjit.cpp          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/vm/callconvbuilder.cpp b/src/coreclr/vm/callconvbuilder.cpp
index 7303cd960fa10..af5d260afb082 100644
--- a/src/coreclr/vm/callconvbuilder.cpp
+++ b/src/coreclr/vm/callconvbuilder.cpp
@@ -453,7 +453,7 @@ HRESULT CallConv::TryGetCallingConventionFromUnmanagedCallConv(
 
     InlineFactory<SArray<CaValue>, 4> caValueArrayFactory;
     DomainAssembly* domainAssembly = pMD->GetLoaderModule()->GetDomainAssembly();
-    IfFailThrow(Attribute::ParseArgumentValues(
+    IfFailThrow(CustomAttribute::ParseArgumentValues(
         pData,
         cData,
         &caValueArrayFactory,
@@ -528,7 +528,7 @@ bool CallConv::TryGetCallingConventionFromUnmanagedCallersOnly(_In_ MethodDesc*
 
     InlineFactory<SArray<CaValue>, 4> caValueArrayFactory;
     DomainAssembly* domainAssembly = pMD->GetLoaderModule()->GetDomainAssembly();
-    IfFailThrow(Attribute::ParseArgumentValues(
+    IfFailThrow(CustomAttribute::ParseArgumentValues(
         pData,
         cData,
         &caValueArrayFactory,
diff --git a/src/coreclr/vm/customattribute.cpp b/src/coreclr/vm/customattribute.cpp
index d68072d4ea91a..4386c74f1daae 100644
--- a/src/coreclr/vm/customattribute.cpp
+++ b/src/coreclr/vm/customattribute.cpp
@@ -326,7 +326,7 @@ static HRESULT ParseCaNamedArgs(
     return hr;
 }
 
-HRESULT Attribute::ParseArgumentValues(
+HRESULT CustomAttribute::ParseArgumentValues(
     void* pCa,
     INT32 cCa,
     CaValueArrayFactory* pCaValueArrayFactory,
diff --git a/src/coreclr/vm/customattribute.h b/src/coreclr/vm/customattribute.h
index 5ad802fc7fc0a..b5074872f736b 100644
--- a/src/coreclr/vm/customattribute.h
+++ b/src/coreclr/vm/customattribute.h
@@ -10,7 +10,7 @@
 
 using CaValueArrayFactory = Factory<SArray<CaValue>>;
 
-namespace Attribute
+namespace CustomAttribute
 {
     HRESULT ParseArgumentValues(
         void* pCa,
diff --git a/src/coreclr/vm/gdbjit.cpp b/src/coreclr/vm/gdbjit.cpp
index cd992c7cb7378..2a376726e5285 100644
--- a/src/coreclr/vm/gdbjit.cpp
+++ b/src/coreclr/vm/gdbjit.cpp
@@ -508,7 +508,7 @@ GetDebugInfoFromPDB(MethodDesc* methodDescPtr,
         return E_FAIL;
 
     const Module* mod = methodDescPtr->GetMethodTable()->GetModule();
-    SString modName = mod->GetPEAssembly()->GetPath();
+    SString modName { mod->GetPEAssembly()->GetPath() };
     if (modName.IsEmpty())
         return E_FAIL;
 
@@ -2534,7 +2534,7 @@ void NotifyGdb::OnMethodPrepared(MethodDesc* methodDescPtr)
 
     /* Get module name */
     const Module* mod = methodDescPtr->GetMethodTable()->GetModule();
-    SString modName = mod->GetPEAssembly()->GetPath();
+    SString modName { mod->GetPEAssembly()->GetPath() };
     const char* szModName = modName.GetUTF8();
     const char* szModuleFile = SplitFilename(szModName);