From a3dcc2032f8bf76cddb0f61fe097b2a6d3c83abe Mon Sep 17 00:00:00 2001
From: "Denis.Zharkov" <denis.zharkov@jetbrains.com>
Date: Fri, 24 Feb 2023 13:01:01 +0100
Subject: [PATCH] Drop RawTypeMarker as it's effectively unused anymore

See the previous commits
---
 .../fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt | 2 +-
 .../org/jetbrains/kotlin/types/AbstractTypeApproximator.kt    | 2 +-
 .../src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt | 1 -
 core/descriptors/src/org/jetbrains/kotlin/types/RawType.kt    | 4 +---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
index 98668fae190..da448d3ddd5 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
@@ -184,7 +184,7 @@ data class ConeDefinitelyNotNullType(val original: ConeSimpleKotlinType) : ConeS
 class ConeRawType private constructor(
     lowerBound: ConeSimpleKotlinType,
     upperBound: ConeSimpleKotlinType
-) : ConeFlexibleType(lowerBound, upperBound), RawTypeMarker {
+) : ConeFlexibleType(lowerBound, upperBound) {
     companion object {
         fun create(
             lowerBound: ConeSimpleKotlinType,
diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/types/AbstractTypeApproximator.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/types/AbstractTypeApproximator.kt
index 5e635a26241..89d10150e4a 100644
--- a/compiler/resolution.common/src/org/jetbrains/kotlin/types/AbstractTypeApproximator.kt
+++ b/compiler/resolution.common/src/org/jetbrains/kotlin/types/AbstractTypeApproximator.kt
@@ -143,7 +143,7 @@ abstract class AbstractTypeApproximator(
 
                     val lowerResult = approximateTo(lowerBound, conf, depth)
 
-                    val upperResult = if (type !is RawTypeMarker && lowerBound.typeConstructor() == upperBound.typeConstructor())
+                    val upperResult = if (!type.isRawType() && lowerBound.typeConstructor() == upperBound.typeConstructor())
                         lowerResult?.withNullability(upperBound.isMarkedNullable())
                     else
                         approximateTo(upperBound, conf, depth)
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
index 2c2ea1cac97..999b73accd0 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
@@ -23,7 +23,6 @@ interface DefinitelyNotNullTypeMarker : SimpleTypeMarker
 
 interface FlexibleTypeMarker : KotlinTypeMarker
 interface DynamicTypeMarker : FlexibleTypeMarker
-interface RawTypeMarker : FlexibleTypeMarker
 interface StubTypeMarker : SimpleTypeMarker
 
 interface TypeArgumentListMarker
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/RawType.kt b/core/descriptors/src/org/jetbrains/kotlin/types/RawType.kt
index 177084f6b6c..40720820401 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/RawType.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/RawType.kt
@@ -16,6 +16,4 @@
 
 package org.jetbrains.kotlin.types
 
-import org.jetbrains.kotlin.types.model.RawTypeMarker
-
-interface RawType : RawTypeMarker
\ No newline at end of file
+interface RawType