Misc. little merge fixes for compiler

ldc-developers · Jul 16, 2024 · 3b16b38 · 3b16b38
1 parent a5a7b6b
commit 3b16b38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dmd/cppmanglewin.d b/dmd/cppmanglewin.d
@@ -55,7 +55,7 @@ version (IN_LLVM)
 {
     // Return the mangled name of the RTTI Type Descriptor.
     // Reverse-engineered using a few C++ exception classes.
-    scope VisualCPPMangler v = new VisualCPPMangler(false, s.loc, global.errorSink);
+    scope VisualCPPMangler v = new VisualCPPMangler(s.loc, global.errorSink);
     v.buf.writestring("\1??_R0?AV");
     v.mangleIdent(s);
     v.buf.writestring("@8");

diff --git a/dmd/mars.d b/dmd/mars.d
@@ -475,6 +475,7 @@ extern(C) void flushMixins()
 version (IN_LLVM)
 {
     import dmd.cli : Usage;
+    import dmd.errors : deprecation, error;
 
     private bool parseCLIOption(string groupName, Usage.Feature[] features)(ref Param params, const(char)* name)
     {
@@ -1918,7 +1919,7 @@ version (IN_LLVM) {} else
     if (IN_LLVM && FileName.equals(ext, bc_ext))
     {
         global.params.bitcodeFiles.push(file);
-        return null;
+        return false;
     }
     if (FileName.equals(ext, target.lib_ext))
     {