Fix compiler-explorer#5255

OfekShilon · Nov 2, 2023 · eb4446a · eb4446a
1 parent 4a8fdbf
commit eb4446a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/base-compiler.ts b/lib/base-compiler.ts
@@ -633,7 +633,7 @@ export class BaseCompiler implements ICompiler {
     }
 
     getGccDumpFileName(outputFilename: string) {
-        return outputFilename.replace(path.extname(outputFilename), '.dump');
+        return outputFilename.substring(0, outputFilename.lastIndexOf('.')) + '.dump';
     }
 
     getGccDumpOptions(gccDumpOptions, outputFilename: string) {
@@ -1402,27 +1402,27 @@ export class BaseCompiler implements ICompiler {
     }
 
     getRustMacroExpansionOutputFilename(inputFilename) {
-        return inputFilename.replace(path.extname(inputFilename), '.expanded.rs');
+        return inputFilename.substring(0, inputFilename.lastIndexOf('.')) + '.expanded.rs';
     }
 
     getRustHirOutputFilename(inputFilename) {
-        return inputFilename.replace(path.extname(inputFilename), '.hir');
+        return inputFilename.substring(0, inputFilename.lastIndexOf('.')) + '.hir';
     }
 
     getRustMirOutputFilename(outputFilename) {
-        return outputFilename.replace(path.extname(outputFilename), '.mir');
+        return outputFilename.substring(0, outputFilename.lastIndexOf('.')) + '.mir';
     }
 
     getHaskellCoreOutputFilename(inputFilename) {
-        return inputFilename.replace(path.extname(inputFilename), '.dump-simpl');
+        return inputFilename.substring(0, inputFilename.lastIndexOf('.')) + '.dump-simpl';
     }
 
     getHaskellStgOutputFilename(inputFilename) {
-        return inputFilename.replace(path.extname(inputFilename), '.dump-stg-final');
+        return inputFilename.substring(0, inputFilename.lastIndexOf('.')) + '.dump-stg-final';
     }
 
     getHaskellCmmOutputFilename(inputFilename) {
-        return inputFilename.replace(path.extname(inputFilename), '.dump-cmm');
+        return inputFilename.substring(0, inputFilename.lastIndexOf('.')) + '.dump-cmm';
     }
 
     // Currently called for getting macro expansion and HIR.
@@ -1495,7 +1495,7 @@ export class BaseCompiler implements ICompiler {
 
     getIrOutputFilename(inputFilename: string, filters: ParseFiltersAndOutputOptions): string {
         // filters are passed because rust needs to know whether a binary is being produced or not
-        return inputFilename.replace(path.extname(inputFilename), '.ll');
+        return inputFilename.substring(0, inputFilename.lastIndexOf('.')) + '.ll';
     }
 
     getOutputFilename(dirPath: string, outputFilebase: string, key?: any): string {

diff --git a/lib/compilers/clang.ts b/lib/compilers/clang.ts
@@ -79,7 +79,7 @@ export class ClangCompiler extends BaseCompiler {
         let timeTraceJson = '';
         const outputExt = path.extname(outputFilename);
         if (outputExt) {
-            timeTraceJson = outputFilename.replace(outputExt, '.json');
+            timeTraceJson = outputFilename.substring(0, outputFilename.lastIndexOf('.')) + '.json';
         } else {
             timeTraceJson += '.json';
         }