ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decompilation of synchronized blocks generated by the Kotlin compiler

Browse Source
This commit is contained in:
upnotes
2018-08-10 15:00:26 +02:00
committed by Roman Shevchenko
parent 2431c0fe94
commit 7e98f686c0
6 changed files with 180 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java vendored
View File

@@ -17,6 +17,7 @@ public interface IFernflowerPreferences {
String HIDE_DEFAULT_CONSTRUCTOR = "hdc";
String DECOMPILE_GENERIC_SIGNATURES = "dgs";
String NO_EXCEPTIONS_RETURN = "ner";
String KT_SYNCHRONIZED_MONITOR = "ksm";
String DECOMPILE_ENUM = "den";
String REMOVE_GET_CLASS_NEW = "rgn";
String LITERALS_AS_IS = "lit";
@@ -61,6 +62,7 @@ public interface IFernflowerPreferences {
defaults.put(HIDE_DEFAULT_CONSTRUCTOR, "1");
defaults.put(DECOMPILE_GENERIC_SIGNATURES, "0");
defaults.put(NO_EXCEPTIONS_RETURN, "1");
defaults.put(KT_SYNCHRONIZED_MONITOR, "1");
defaults.put(DECOMPILE_ENUM, "1");
defaults.put(REMOVE_GET_CLASS_NEW, "1");
defaults.put(LITERALS_AS_IS, "0");

5
src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
View File

@@ -88,6 +88,11 @@ public class MethodProcessorRunnable implements Runnable {
ExceptionDeobfuscator.removeEmptyRanges(graph);
}
if (DecompilerContext.getOption(IFernflowerPreferences.KT_SYNCHRONIZED_MONITOR)) {
// special case: search for 'synchronized' ranges w/o monitorexit instruction (generated by the Kotlin compiler)
DeadCodeHelper.extendSynchronizedRangeToMonitorexit(graph);
}
if (DecompilerContext.getOption(IFernflowerPreferences.NO_EXCEPTIONS_RETURN)) {
// special case: single return instruction outside of a protected range
DeadCodeHelper.incorporateValueReturns(graph);