-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
avoid FrameType interpreter internal constants leaking as public API
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
- 9.0.5.0
- 9.0.4.0
- 9.0.3.0
- 9.0.1.0
Showing
2 changed files
with
15 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 14 additions & 19 deletions
33
core/src/main/java/org/jruby/runtime/backtrace/FrameType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,41 @@ | ||
| package org.jruby.runtime.backtrace; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import org.jruby.internal.runtime.methods.InterpretedIRBodyMethod; | ||
| import org.jruby.internal.runtime.methods.InterpretedIRMetaClassBody; | ||
| import org.jruby.internal.runtime.methods.InterpretedIRMethod; | ||
| import org.jruby.internal.runtime.methods.MixedModeIRMethod; | ||
| import org.jruby.ir.interpreter.Interpreter; | ||
| import org.jruby.runtime.InterpretedIRBlockBody; | ||
|
|
||
| public enum FrameType { | ||
| METHOD, BLOCK, EVAL, CLASS, MODULE, METACLASS, ROOT; | ||
| @Deprecated // no longer accessed directly | ||
| public static final Set<String> INTERPRETED_CLASSES = new HashSet<String>(4, 1); | ||
| @Deprecated // no longer accessed directly | ||
| public static final Map<String, FrameType> INTERPRETED_FRAMES = new HashMap<String, FrameType>(8, 1); | ||
|
|
||
| private static final Set<String> INTERPRETED_CLASSES = new HashSet<String>(4, 1); | ||
|
|
||
| static { | ||
| INTERPRETED_CLASSES.add(Interpreter.class.getName()); | ||
| INTERPRETED_CLASSES.add(MixedModeIRMethod.class.getName()); | ||
| INTERPRETED_CLASSES.add(InterpretedIRMethod.class.getName()); | ||
| INTERPRETED_CLASSES.add(InterpretedIRBodyMethod.class.getName()); | ||
|
|
||
| INTERPRETED_FRAMES.put("INTERPRET_METHOD", FrameType.METHOD); | ||
| INTERPRETED_FRAMES.put("INTERPRET_EVAL", FrameType.EVAL); | ||
| INTERPRETED_FRAMES.put("INTERPRET_CLASS", FrameType.CLASS); | ||
| INTERPRETED_FRAMES.put("INTERPRET_MODULE", FrameType.MODULE); | ||
| INTERPRETED_FRAMES.put("INTERPRET_METACLASS", FrameType.METACLASS); | ||
| INTERPRETED_FRAMES.put("INTERPRET_BLOCK", FrameType.BLOCK); | ||
| INTERPRETED_FRAMES.put("INTERPRET_ROOT", FrameType.ROOT); | ||
| } | ||
|
|
||
| public static boolean isInterpreterFrame(final String className, final String methodName) { | ||
| return INTERPRETED_CLASSES.contains(className) && | ||
| INTERPRETED_FRAMES.containsKey(methodName); | ||
| if ( ! INTERPRETED_CLASSES.contains(className) ) return false; | ||
| return getInterpreterFrame(methodName) != null; | ||
| } | ||
|
|
||
| public static FrameType getInterpreterFrame(final String methodName) { | ||
| return INTERPRETED_FRAMES.get(methodName); | ||
| switch ( methodName ) { | ||
| case "INTERPRET_METHOD" : return FrameType.METHOD; | ||
| case "INTERPRET_EVAL" : return FrameType.EVAL; | ||
| case "INTERPRET_CLASS" : return FrameType.CLASS; | ||
| case "INTERPRET_MODULE" : return FrameType.MODULE; | ||
| case "INTERPRET_METACLASS" : return FrameType.METACLASS; | ||
| case "INTERPRET_BLOCK" : return FrameType.BLOCK; | ||
| case "INTERPRET_ROOT" : return FrameType.ROOT; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| } |