Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core.transform-kit): 检查缺少方法时先看旧类是否有实现 #1270

Merged
merged 1 commit into from
Dec 12, 2023
Merged

fix(core.transform-kit): 检查缺少方法时先看旧类是否有实现 #1270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions ...e/transform-kit/src/main/kotlin/com/tencent/shadow/core/transform_kit/ReplaceClassName.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import javassist.expr.ExprEditor
import javassist.expr.MethodCall

object ReplaceClassName {
private val mNewNames = mutableSetOf<String>()
private val oldToNewRenameMap = mutableMapOf<String, String>()

/**
* MutableMap<defClass, MutableMap<method, MutableSet<useClass>>>
Expand All @@ -34,13 +34,13 @@ object ReplaceClassName {
mutableMapOf()

fun resetErrorCount() {
mNewNames.clear()
oldToNewRenameMap.clear()
errorResult.clear()
}

fun replaceClassName(ctClass: CtClass, oldName: String, newName: String) {
ctClass.replaceClassName(oldName, newName)
mNewNames.add(newName)
oldToNewRenameMap[oldName] = newName
}

fun checkAll(
Expand All @@ -49,9 +49,12 @@ object ReplaceClassName {
): Map<String, Map<String, Set<String>>> {
inputClassNames.forEach { inputClassName ->
val inputClass = classPool[inputClassName]
if (inputClass.refClasses.any { mNewNames.contains(it) }) {
mNewNames.forEach { newName ->
inputClass.checkMethodExist(classPool[newName])
val oldNames = oldToNewRenameMap.keys
val newNames = oldToNewRenameMap.values
if (inputClass.refClasses.any { newNames.contains(it) }) {
oldNames.forEach { oldName ->
val newName = oldToNewRenameMap[oldName]
inputClass.checkMethodExist(classPool[oldName], classPool[newName])
}
}
}
Expand All @@ -61,14 +64,21 @@ object ReplaceClassName {
/**
* 检查ctClass对refClassName引用的方法确实都存在
*/
private fun CtClass.checkMethodExist(refClass: CtClass) {
private fun CtClass.checkMethodExist(oldClass: CtClass, newClass: CtClass) {
val invokeClass = name
val refClassName = refClass.name
val refClassName = newClass.name
instrument(object : ExprEditor() {
override fun edit(m: MethodCall) {
if (m.className == refClassName) {
try {
refClass.getMethod(m.methodName, m.signature)
oldClass.getMethod(m.methodName, m.signature)
} catch (ignored: NotFoundException) {
//替换前旧的类就没有这个方法，就不用管替换后的类是否实现了。
return
}

try {
newClass.getMethod(m.methodName, m.signature)
} catch (ignored: NotFoundException) {
val methodString = "${m.methodName}:${m.signature}"
var methodMap = errorResult[refClassName]
Expand Down
Loading