CLJ-2427 CompilerException toString() throws when RT not yet initialized

Signed-off-by: Rich Hickey <richhickey@gmail.com>

Author: puredanger

src/jvm/clojure/lang/Compiler.java

@@ -6875,21 +6875,19 @@ public static String makeMsg(String source, int line, int column, Symbol sym, Ke
 				line + ":" + column + ").";
 	}
 
-	private static boolean isSpecError(Throwable t) {
-		return (t instanceof IExceptionInfo) && RT.get(((IExceptionInfo) t).getData(), SPEC_PROBLEMS) != null;
-	}
-
 	public String toString(){
 		Throwable cause = getCause();
 		if(cause != null) {
-			if(RT.get(data, ERR_PHASE) == PHASE_MACRO_SYNTAX_CHECK && isSpecError(cause)) {
-				return String.format("%s", getMessage());
-			} else {
-				return String.format("%s%n%s", getMessage(), cause.getMessage());
+			if (cause instanceof IExceptionInfo) {
+				IPersistentMap data = (IPersistentMap)((IExceptionInfo)cause).getData();
+				if(PHASE_MACRO_SYNTAX_CHECK.equals(data.valAt(ERR_PHASE)) && data.valAt(SPEC_PROBLEMS) != null) {
+					return String.format("%s", getMessage());
+				} else {
+					return String.format("%s%n%s", getMessage(), cause.getMessage());
+				}
 			}
-		} else {
-			return getMessage();
 		}
+		return getMessage();
 	}
 }
 

test/clojure/test_clojure/evaluation.clj

@@ -15,7 +15,7 @@
 ;;  Created 22 October 2008
 
 (ns clojure.test-clojure.evaluation
-  (:use clojure.test))
+  (:use clojure.test clojure.test-helper))
 
 (import '(java.lang Boolean)
         '(clojure.lang Compiler Compiler$CompilerException))
@@ -116,16 +116,16 @@
 
   (test-that
     "It is an error if there is no global var named by the symbol"
-    (throws-with-msg
-      #"(?s).*Unable to resolve symbol: bar.*" (eval 'bar)))
+    (is (thrown-with-cause-msg? Compiler$CompilerException
+          #"(?s).*Unable to resolve symbol: bar.*"
+          (eval 'bar))))
 
   (test-that
     "It is an error if the symbol reference is to a non-public var in a
     different namespace"
-    (throws-with-msg
-      #"(?s).*resolution-test/baz is not public.*"
-      (eval 'resolution-test/baz)
-      Compiler$CompilerException))
+    (is (thrown-with-cause-msg? Compiler$CompilerException
+          #"(?s).*resolution-test/baz is not public.*"
+          (eval 'resolution-test/baz))))
 
   (test-that
     "If a symbol is package-qualified, its value is the Java class named by the