azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM: Reduce number of comparison on bytecode analysis merge

Browse Source 
operations. Since these methods are hot - they are call on each branch,
even such primitive optimizations should give measurable speedup.
This commit is contained in:
Ilmir Usmanov
2023-08-24 16:32:35 +02:00
committed by Space Team
parent 5e2d3737f5
commit f16ea9dfbb
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt
+12 -9
View File
@@ -174,17 +174,20 @@ open class BoxingInterpreter(
when {
v == StrictBasicValue.UNINITIALIZED_VALUE || w == StrictBasicValue.UNINITIALIZED_VALUE ->
StrictBasicValue.UNINITIALIZED_VALUE
v is BoxedBasicValue && w is BoxedBasicValue -> {
onMergeSuccess(v, w)
when {
v is TaintedBoxedValue -> v
w is TaintedBoxedValue -> w
v.type != w.type -> mergeBoxedHazardous(v, w, isLocalVariable)
else -> v // two clean boxed values with the same type are equal
v is BoxedBasicValue -> {
if (w is BoxedBasicValue) {
onMergeSuccess(v, w)
when {
v is TaintedBoxedValue -> v
w is TaintedBoxedValue -> w
v.type != w.type -> mergeBoxedHazardous(v, w, isLocalVariable)
else -> v // two clean boxed values with the same type are equal
}
} else {
mergeBoxedHazardous(v, w, isLocalVariable)
}
}
v is BoxedBasicValue ->
mergeBoxedHazardous(v, w, isLocalVariable)
w is BoxedBasicValue ->
mergeBoxedHazardous(w, v, isLocalVariable)
else ->
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/ReferenceTrackingInterpreter.kt
+7 -3
View File
@@ -30,10 +30,14 @@ abstract class ReferenceTrackingInterpreter : OptimizationBasicInterpreter() {
else
createTaintedValue(v, w)
v is TrackedReferenceValue && w is TrackedReferenceValue ->
createPossiblyMergedValue(v, w)
v is TrackedReferenceValue -> {
if (w is TrackedReferenceValue)
createPossiblyMergedValue(v, w)
else
createTaintedValue(v, w)
}
v is TrackedReferenceValue || w is TrackedReferenceValue ->
w is TrackedReferenceValue ->
createTaintedValue(v, w)
else ->
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/NullabilityInterpreter.kt
+15 -14
View File
@@ -96,20 +96,21 @@ class NullabilityInterpreter(private val generationState: GenerationState) : Opt
override fun merge(v: BasicValue, w: BasicValue): BasicValue =
when {
v is NullBasicValue && w is NullBasicValue ->
NullBasicValue
v is NullBasicValue || w is NullBasicValue ->
StrictBasicValue.REFERENCE_VALUE
v is ProgressionIteratorBasicValue && w is ProgressionIteratorBasicValue ->
mergeNotNullValuesOfSameKind(v, w)
v is ProgressionIteratorBasicValue && w is NotNullBasicValue ->
NotNullBasicValue.NOT_NULL_REFERENCE_VALUE
w is ProgressionIteratorBasicValue && v is NotNullBasicValue ->
NotNullBasicValue.NOT_NULL_REFERENCE_VALUE
v is NotNullBasicValue && w is NotNullBasicValue ->
mergeNotNullValuesOfSameKind(v, w)
else ->
super.merge(v, w)
v === NullBasicValue -> if (w === NullBasicValue) NullBasicValue else StrictBasicValue.REFERENCE_VALUE
w === NullBasicValue -> StrictBasicValue.REFERENCE_VALUE
v is ProgressionIteratorBasicValue -> when (w) {
is ProgressionIteratorBasicValue -> mergeNotNullValuesOfSameKind(v, w)
is NotNullBasicValue -> NotNullBasicValue.NOT_NULL_REFERENCE_VALUE
else -> super.merge(v, w)
}
v is NotNullBasicValue -> when (w) {
is ProgressionIteratorBasicValue -> NotNullBasicValue.NOT_NULL_REFERENCE_VALUE
is NotNullBasicValue -> mergeNotNullValuesOfSameKind(v, w)
else -> super.merge(v, w)
}
else -> super.merge(v, w)
}
private fun mergeNotNullValuesOfSameKind(v: StrictBasicValue, w: StrictBasicValue) =