bfu/asmtools
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CODETOOLS-7902132 JTReg compiled .jasm files end up with incorrect class file versions

Browse Source
This commit is contained in:
lkuskov 2018-03-13 15:40:28 -07:00
parent 1b7d451d11
commit 0c8feaab90
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/openjdk/asmtools/jasm/CFVersion.java
View File

@ -37,46 +37,50 @@ public class CFVersion implements Cloneable{
private short major_version; private short major_version;
private short minor_version; private short minor_version;
private boolean frozen = false; private boolean frozen;
private boolean isSet;
public CFVersion() { public CFVersion() {
frozen = false;
isSet = false;
major_version = UNDEFINED_VERSION; major_version = UNDEFINED_VERSION;
minor_version = UNDEFINED_VERSION; minor_version = UNDEFINED_VERSION;
} }
public CFVersion(boolean frozenCFV, short major_version, short minor_version) { public CFVersion(boolean frozenCFV, short major_version, short minor_version) {
isSet = true;
frozen = frozenCFV; frozen = frozenCFV;
this.major_version = major_version; this.major_version = major_version;
this.minor_version = minor_version; this.minor_version = minor_version;
} }
public void setMajorVersion(short major_version) { public void setMajorVersion(short major_version) {
if ( !frozen ) if ( !frozen ) {
isSet = true;
this.major_version = major_version; this.major_version = major_version;
}
} }
public void setMinorVersion(short minor_version) { public void setMinorVersion(short minor_version) {
if (!frozen) if (!frozen) {
isSet = true;
this.minor_version = minor_version; this.minor_version = minor_version;
} }
private boolean isSet() {
return this.major_version != UNDEFINED_VERSION && this.minor_version != UNDEFINED_VERSION;
} }
public String asString() { public String asString() {
return (isSet()) ? this.major_version + ":" +this.minor_version : "(undef):(undef)"; return (isSet) ? this.major_version + ":" +this.minor_version : "(undef):(undef)";
} }
public void initModuleDefaults() { public void initModuleDefaults() {
if( ! isSet()) { if( ! isSet) {
major_version = DEFAULT_MODULE_MAJOR_VERSION; major_version = DEFAULT_MODULE_MAJOR_VERSION;
minor_version = DEFAULT_MODULE_MINOR_VERSION; minor_version = DEFAULT_MODULE_MINOR_VERSION;
} }
} }
public void initClassDefaults() { public void initClassDefaults() {
if( !isSet() ) { if( !isSet ) {
major_version = DEFAULT_MAJOR_VERSION; major_version = DEFAULT_MAJOR_VERSION;
minor_version = DEFAULT_MINOR_VERSION; minor_version = DEFAULT_MINOR_VERSION;
} }