Skip to content

Commit 37f3c5b

Browse files
InterpreterResolvedJavaMethod: make sure some members can't be null.
1 parent f63e91d commit 37f3c5b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/InterpreterResolvedJavaMethod.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ private InterpreterResolvedJavaMethod(Symbol<Name> name,
170170
InterpreterResolvedObjectType declaringClass, InterpreterUnresolvedSignature signature,
171171
byte[] code, ExceptionHandler[] exceptionHandlers, LineNumberTable lineNumberTable, LocalVariableTable localVariableTable,
172172
ReferenceConstant<FunctionPointerHolder> nativeEntryPoint, int vtableIndex, int gotOffset, int enterStubOffset, int methodId, SignaturePolymorphicIntrinsic intrinsic) {
173-
this.name = name;
173+
this.name = MetadataUtil.requireNonNull(name);
174174
this.maxLocals = maxLocals;
175175
this.maxStackSize = maxStackSize;
176176
this.modifiers = modifiers;
177177
this.isSubstitutedNative = isSubstitutedNative;
178-
this.declaringClass = declaringClass;
179-
this.signature = signature;
178+
this.declaringClass = MetadataUtil.requireNonNull(declaringClass);
179+
this.signature = MetadataUtil.requireNonNull(signature);
180180
this.interpretedCode = code;
181181
this.exceptionHandlers = exceptionHandlers;
182182
this.lineNumberTable = lineNumberTable;
@@ -197,10 +197,10 @@ private InterpreterResolvedJavaMethod(Symbol<Name> name,
197197

198198
protected InterpreterResolvedJavaMethod(InterpreterResolvedObjectType declaringClass, ParserMethod m, int vtableIndex) {
199199
assert RuntimeClassLoading.isSupported();
200-
this.name = m.getName();
201-
this.signatureSymbol = m.getSignature();
200+
this.name = MetadataUtil.requireNonNull(m.getName());
201+
this.signatureSymbol = MetadataUtil.requireNonNull(m.getSignature());
202202

203-
this.declaringClass = declaringClass;
203+
this.declaringClass = MetadataUtil.requireNonNull(declaringClass);
204204
this.modifiers = m.getFlags() & Constants.JVM_RECOGNIZED_METHOD_MODIFIERS;
205205
this.signaturePolymorphic = (m.getFlags() & ACC_SIGNATURE_POLYMORPHIC) != 0;
206206
CodeAttribute codeAttribute = (CodeAttribute) m.getAttribute(CodeAttribute.NAME);

0 commit comments

Comments
 (0)