DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow to retrieve Android Model Class with different cha

This commit is contained in:
Martin Mohr 2014-12-20 18:04:51 +01:00
parent 1acbf4b9f7
commit 8610ac29c7
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java
View File

@ -1,12 +1,3 @@
/*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html.
*
* This file is a derivative of code released under the terms listed below.
*
*/
/* /*
* Copyright (c) 2013, * Copyright (c) 2013,
* Tobias Blaschke <code@tobiasblaschke.de> * Tobias Blaschke <code@tobiasblaschke.de>
@ -47,7 +38,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.CallSiteReference;
import com.ibm.wala.classLoader.FieldImpl; import com.ibm.wala.classLoader.FieldImpl;
@ -88,36 +81,30 @@ import com.ibm.wala.util.strings.Atom;
* @todo Move this class into an other loader? Currently: Primordial * @todo Move this class into an other loader? Currently: Primordial
*/ */
public final /* singleton */ class AndroidModelClass extends SyntheticClass { public final /* singleton */ class AndroidModelClass extends SyntheticClass {
private static Logger logger = LoggerFactory.getLogger(AndroidModelClass.class);
public static final TypeReference ANDROID_MODEL_CLASS = TypeReference.findOrCreate( public static final TypeReference ANDROID_MODEL_CLASS = TypeReference.findOrCreate(
ClassLoaderReference.Primordial, TypeName.string2TypeName("Lcom/ibm/wala/AndroidModelClass")); ClassLoaderReference.Primordial, TypeName.string2TypeName("Lcom/ibm/wala/AndroidModelClass"));
private static IClassHierarchy cha; private IClassHierarchy cha;
private static class AndroidModelClassHolder {
private static final AndroidModelClass INSTANCE = new AndroidModelClass(AndroidModelClass.cha);
}
public static AndroidModelClass getInstance(IClassHierarchy cha) { public static AndroidModelClass getInstance(IClassHierarchy cha) {
if (AndroidModelClass.cha == null) { IClass android = cha.lookupClass(ANDROID_MODEL_CLASS);
if (cha == null) { AndroidModelClass mClass;
throw new IllegalArgumentException("Cha may not be null if there had not been an Instance AndroidModelClass before!"); if (android == null) {
} else { mClass = new AndroidModelClass(cha);
AndroidModelClass.cha = cha; } else if (!(android instanceof AndroidModelClass)) {
} throw new IllegalArgumentException(String.format("android model class does not have expected type %s, but %s!", AndroidModelClass.class, android.getClass().toString()));
} else { } else {
if (! cha.equals(AndroidModelClass.cha)) { mClass = (AndroidModelClass) android;
throw new IllegalArgumentException("Cha differs!");
}
} }
return AndroidModelClassHolder.INSTANCE; return mClass;
} }
private AndroidModelClass(IClassHierarchy cha) { private AndroidModelClass(IClassHierarchy cha) {
super(ANDROID_MODEL_CLASS, cha); super(ANDROID_MODEL_CLASS, cha);
this.addMethod(this.clinit()); this.addMethod(this.clinit());
this.cha = cha;
if (AndroidModelClassHolder.INSTANCE != null) { // May be caused when using reflection this.cha.addClass(this);
throw new IllegalStateException("AndroidModelClass is a singleton and already instantiated!");
}
} }
/** /**
@ -193,7 +180,7 @@ public final /* singleton */ class AndroidModelClass extends SyntheticClass {
return methods.get(selector); return methods.get(selector);
} }
if (selector.equals(MethodReference.initSelector)) { if (selector.equals(MethodReference.initSelector)) {
logger.warn("AndroidModelClass is not intended to be initialized");
return null; return null;
} }
throw new IllegalArgumentException("Could not resolve " + selector); throw new IllegalArgumentException("Could not resolve " + selector);