Merge fix: Restore Scope::search() as C++ function

We need it in `gen/asm-x86.h`.
bangbangsheshotmedown · Nov 6, 2023 · fd66fb4 · fd66fb4
1 parent 2b3ffeb
commit fd66fb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dmd/dscope.d b/dmd/dscope.d
@@ -349,7 +349,7 @@ version (IN_LLVM)
      * Returns:
      *  symbol if found, null if not
      */
-    extern (D) Dsymbol search(const ref Loc loc, Identifier ident, Dsymbol* pscopesym, int flags = IgnoreNone)
+    extern (C++) Dsymbol search(const ref Loc loc, Identifier ident, Dsymbol* pscopesym, int flags = IgnoreNone)
     {
         version (LOGSEARCH)
         {

diff --git a/dmd/scope.h b/dmd/scope.h
@@ -129,4 +129,6 @@ struct Scope
 
     AliasDeclaration *aliasAsg; // if set, then aliasAsg is being assigned a new value,
                                 // do not set wasRead for it
+
+    Dsymbol *search(const Loc &loc, Identifier *ident, Dsymbol **pscopesym, int flags = IgnoreNone);
 };