Merge branch 'bugfix/msbuild-task-message-null' into develop

iterate-ch · Nov 28, 2024 · 15cad32 · 15cad32
2 parents a76579e + 05c39eb
commit 15cad32
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/IKVM.MSBuild.Tasks/IkvmToolTaskDiagnosticWriter.cs b/src/IKVM.MSBuild.Tasks/IkvmToolTaskDiagnosticWriter.cs
@@ -54,10 +54,10 @@ public async ValueTask ReceiveAsync(IkvmToolDiagnosticEvent @event, Cancellation
                         logger.LogWarning(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, @event.Message, @event.Args);
                         break;
                     case IkvmToolDiagnosticEventLevel.Error:
-                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, MessageImportance.Normal, @event.Message, @event.Args);
+                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, @event.Message, @event.Args);
                         break;
                     case IkvmToolDiagnosticEventLevel.Fatal:
-                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, MessageImportance.High, @event.Message, @event.Args);
+                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, @event.Message, @event.Args);
                         break;
                 }
 

diff --git a/src/IKVM.Runtime/MethodAnalyzer.cs b/src/IKVM.Runtime/MethodAnalyzer.cs
@@ -2485,7 +2485,7 @@ private void ConditionalPatchNoClassDefFoundError(ref ClassFile.Method.Instructi
         private void SetHardError(RuntimeClassLoader classLoader, ref ClassFile.Method.Instruction instruction, HardError hardError, string message, params object[] args)
         {
             string text = string.Format(message, args);
-#if IMPORTER
+
             switch (hardError)
             {
                 case HardError.NoClassDefFoundError:
@@ -2518,7 +2518,7 @@ private void SetHardError(RuntimeClassLoader classLoader, ref ClassFile.Method.I
                 default:
                     throw new InvalidOperationException();
             }
-#endif
+            
             instruction.SetHardError(hardError, AllocErrorMessage(text));
         }
 

diff --git a/src/IKVM.Runtime/compiler.cs b/src/IKVM.Runtime/compiler.cs
@@ -2565,7 +2565,6 @@ void Compile(Block block, int startIndex)
                             }
 
                             var message = harderrors[instr.HardErrorMessageId];
-                            clazz.ClassLoader.Diagnostics.GenericCompilerError($"{exceptionType.Name}: {message}\n\tat {classFile.Name}.{m.Name}{m.Signature}");
                             ilGenerator.Emit(OpCodes.Ldstr, message);
                             RuntimeJavaMethod method = exceptionType.GetMethodWrapper("<init>", "(Ljava.lang.String;)V", false);
                             method.Link();

diff --git a/src/IKVM.Tools.Importer/ImportContext.cs b/src/IKVM.Tools.Importer/ImportContext.cs
@@ -569,7 +569,7 @@ void ContinueParseCommandLine(RuntimeContext context, StaticCompiler compiler, I
 
             if (options.NoWarn != null)
                 foreach (var diagnostic in options.NoWarn)
-                    compilerOptions.suppressWarnings.Add($"IKVM{diagnostic.Id:D4}");
+                    compilerOptions.suppressWarnings.Add(diagnostic.Id.ToString());
 
             // TODO handle specific diagnostic IDs
             if (options.WarnAsError != null)
@@ -578,7 +578,7 @@ void ContinueParseCommandLine(RuntimeContext context, StaticCompiler compiler, I
                     compilerOptions.warnaserror = true;
                 else
                     foreach (var i in options.WarnAsError)
-                        compilerOptions.errorWarnings.Add($"IKVM{i.Id:D4}");
+                        compilerOptions.errorWarnings.Add(i.Id.ToString());
             }
 
             if (options.Runtime != null)