[PATCH] D145710: [ORC] Fix name shadowing issue, NFC.

[Aman LaChapelle via Phabricator via llvm-commits]

bzcheeseman created this revision.
Herald added a subscriber: hiraditya.
Herald added a project: All.
bzcheeseman requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Testing the COFFPlatform on MSVC, a name shadowing issue surfaced where `LoadDynLibrary` inside the constructor was actually using the moved-from function argument. This patch simply renames the argument to avoid that shadowing.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D145710

Files:
  llvm/include/llvm/ExecutionEngine/Orc/COFFPlatform.h
  llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp


Index: llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
===================================================================
--- llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
+++ llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
@@ -352,11 +352,11 @@
 COFFPlatform::COFFPlatform(ExecutionSession &ES,
                            ObjectLinkingLayer &ObjLinkingLayer,
                            JITDylib &PlatformJD, const char *OrcRuntimePath,
-                           LoadDynamicLibrary LoadDynLibrary,
+                           LoadDynamicLibrary LoadDynamicLibrary,
                            bool StaticVCRuntime, const char *VCRuntimePath,
                            Error &Err)
     : ES(ES), ObjLinkingLayer(ObjLinkingLayer),
-      LoadDynLibrary(std::move(LoadDynLibrary)),
+      LoadDynLibrary(std::move(LoadDynamicLibrary)),
       StaticVCRuntime(StaticVCRuntime),
       COFFHeaderStartSymbol(ES.intern("__ImageBase")) {
   ErrorAsOutParameter _(&Err);
Index: llvm/include/llvm/ExecutionEngine/Orc/COFFPlatform.h
===================================================================
--- llvm/include/llvm/ExecutionEngine/Orc/COFFPlatform.h
+++ llvm/include/llvm/ExecutionEngine/Orc/COFFPlatform.h
@@ -138,7 +138,7 @@
 
   COFFPlatform(ExecutionSession &ES, ObjectLinkingLayer &ObjLinkingLayer,
                JITDylib &PlatformJD, const char *OrcRuntimePath,
-               LoadDynamicLibrary LoadDynLibrary, bool StaticVCRuntime,
+               LoadDynamicLibrary LoadDynamicLibrary, bool StaticVCRuntime,
                const char *VCRuntimePath, Error &Err);
 
   // Associate COFFPlatform JIT-side runtime support functions with handlers.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D145710.503856.patch
Type: text/x-patch
Size: 1658 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230309/de1396d5/attachment.bin>