azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decompose Intrinsics#checkParameterIsNotNull to make it JIT-able

Browse Source 
#KT-5635 Fixed
This commit is contained in:
Alexander Udalov
2014-08-14 12:46:03 +04:00
parent 99d4f97aef
commit 2284e3de5a
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime.jvm/src/kotlin/jvm/internal/Intrinsics.java
+17 -13
View File
@@ -55,21 +55,25 @@ public class Intrinsics {
public static void checkParameterIsNotNull(Object value, String paramName) { public static void checkParameterIsNotNull(Object value, String paramName) {
if (value == null) { if (value == null) {
StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); throwParameterIsNullException(paramName);
// #0 is Thread.getStackTrace(), #1 is Intrinsics.checkParameterIsNotNull, #2 is our caller
StackTraceElement caller = stackTraceElements[2];
String className = caller.getClassName();
String methodName = caller.getMethodName();
IllegalArgumentException exception =
new IllegalArgumentException("Parameter specified as non-null is null: " +
"method " + className + "." + methodName +
", parameter " + paramName);
throw sanitizeStackTrace(exception);
} }
} }
private static void throwParameterIsNullException(String paramName) {
StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
// #0 is Thread.getStackTrace(), #1 is Intrinsics.checkParameterIsNotNull, #2 is our caller
StackTraceElement caller = stackTraceElements[2];
String className = caller.getClassName();
String methodName = caller.getMethodName();
IllegalArgumentException exception =
new IllegalArgumentException("Parameter specified as non-null is null: " +
"method " + className + "." + methodName +
", parameter " + paramName);
throw sanitizeStackTrace(exception);
}
public static int compare(long thisVal, long anotherVal) { public static int compare(long thisVal, long anotherVal) {
return thisVal < anotherVal ? -1 : thisVal == anotherVal ? 0 : 1; return thisVal < anotherVal ? -1 : thisVal == anotherVal ? 0 : 1;
} }
@@ -87,7 +91,7 @@ public class Intrinsics {
} }
private static final Set<String> METHOD_NAMES_TO_SKIP = new HashSet<String>(Arrays.asList( private static final Set<String> METHOD_NAMES_TO_SKIP = new HashSet<String>(Arrays.asList(
"throwNpe", "checkReturnedValueIsNotNull", "checkFieldIsNotNull", "checkParameterIsNotNull" "throwNpe", "checkReturnedValueIsNotNull", "checkFieldIsNotNull", "checkParameterIsNotNull", "throwParameterIsNullException"
)); ));
public static <T extends Throwable> T sanitizeStackTrace(T throwable) { public static <T extends Throwable> T sanitizeStackTrace(T throwable) {