diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.fir.txt
new file mode 100644
index 00000000000..6c789a911cb
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.fir.txt
@@ -0,0 +1,59 @@
+FILE: valueOfOrNull.kt
+    public final enum class SomeEnum : R|kotlin/Enum<SomeEnum>| {
+        private constructor(): R|SomeEnum| {
+            super<R|kotlin/Enum<SomeEnum>|>()
+        }
+
+        public final static enum entry ENTRY: R|SomeEnum|
+        public final static fun values(): R|kotlin/Array<SomeEnum>| {
+        }
+
+        public final static fun valueOf(value: R|kotlin/String|): R|SomeEnum| {
+        }
+
+    }
+    public final fun foo(s: R|kotlin/String?|): R|kotlin/Unit| {
+        lval result: R|SomeEnum| = R|<local>/s|?.{ $subj$.R|kotlin/let|<R|kotlin/String|, R|SomeEnum?|>(<L> = let@fun <anonymous>(it: R|kotlin/String|): R|SomeEnum?| <kind=EXACTLY_ONCE>  {
+            ^ R|/valueOfOrNull|<R|SomeEnum|>(R|<local>/it|)
+        }
+        ) } ?: Q|SomeEnum|.R|/SomeEnum.ENTRY|
+        lval result2: R|SomeEnum| = R|<local>/s|?.{ $subj$.R|kotlin/let|<R|kotlin/String|, R|SomeEnum?|>(<L> = let@fun <anonymous>(it: R|kotlin/String|): R|SomeEnum?| <kind=EXACTLY_ONCE>  {
+            ^ R|/valueOfOrNull|<R|SomeEnum|>(R|<local>/it|)
+        }
+        ) } ?: Q|SomeEnum|.R|/SomeEnum.ENTRY|
+        lval result3: R|SomeEnum?| = when () {
+            ==(R|<local>/s|, Null(null)) ->  {
+                Q|SomeEnum|.R|/SomeEnum.ENTRY|
+            }
+            else ->  {
+                R|/valueOfOrNull|<R|SomeEnum|>(R|<local>/s|)
+            }
+        }
+
+        lval result4: R|SomeEnum?| = when () {
+            ==(R|<local>/s|, Null(null)) ->  {
+                Q|SomeEnum|.R|/SomeEnum.ENTRY|
+            }
+            else ->  {
+                R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|SomeEnum?|>(<L> = let@fun <anonymous>(it: R|kotlin/String|): R|SomeEnum?| <kind=EXACTLY_ONCE>  {
+                    ^ R|/valueOfOrNull|<R|SomeEnum|>(R|<local>/it|)
+                }
+                )
+            }
+        }
+
+    }
+    public final inline fun <reified E : R|kotlin/Enum<E>|> valueOfOrNull(value: R|kotlin/String|): R|E?| {
+        lval <iterator>: R|kotlin/collections/Iterator<E>| = R|kotlin/enumValues|<R|E|>().R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<E>|>|()
+        while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
+            lval enumValue: R|E| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|E|>|()
+            when () {
+                ==(R|<local>/enumValue|.R|kotlin/Enum.name|, R|<local>/value|) ->  {
+                    ^valueOfOrNull R|<local>/enumValue|
+                }
+            }
+
+        }
+
+        ^valueOfOrNull Null(null)
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.kt
new file mode 100644
index 00000000000..68eca9feabe
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.kt
@@ -0,0 +1,19 @@
+enum class SomeEnum {
+    ENTRY;
+}
+
+fun foo(s: String?) {
+    val result = s?.let { valueOfOrNull(it) } ?: SomeEnum.ENTRY
+    val result2 = s?.let { valueOfOrNull<SomeEnum>(it) } ?: SomeEnum.ENTRY
+    val result3 = if (s == null) SomeEnum.ENTRY else valueOfOrNull(s)
+    val result4 = if (s == null) SomeEnum.ENTRY else s.let { valueOfOrNull(it) }
+}
+
+inline fun <reified E : Enum<E>> valueOfOrNull(value: String): E? {
+    for (enumValue in enumValues<E>()) {
+        if (enumValue.name == value) {
+            return enumValue
+        }
+    }
+    return null
+}
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
index 3ee6cbb889b..7528fb0adae 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
@@ -4947,6 +4947,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
                 runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/TypesEligibleForSimpleVisit.kt");
             }
 
+            @Test
+            @TestMetadata("valueOfOrNull.kt")
+            public void testValueOfOrNull() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.kt");
+            }
+
             @Test
             @TestMetadata("weakHashMap.kt")
             public void testWeakHashMap() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
index 2248bdb9a1b..802bef8c050 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -5015,6 +5015,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
                 runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/TypesEligibleForSimpleVisit.kt");
             }
 
+            @Test
+            @TestMetadata("valueOfOrNull.kt")
+            public void testValueOfOrNull() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/valueOfOrNull.kt");
+            }
+
             @Test
             @TestMetadata("weakHashMap.kt")
             public void testWeakHashMap() throws Exception {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt
index 5a12718b312..ae9f03b853f 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt
@@ -38,8 +38,7 @@ object ConeConstraintSystemUtilContext : ConstraintSystemUtilContext {
     }
 
     override fun TypeVariableMarker.isReified(): Boolean {
-        // TODO
-        return false
+        return this is TypeParameterBasedTypeVariable && typeParameterSymbol.fir.isReified
     }
 
     override fun KotlinTypeMarker.refineType(): KotlinTypeMarker {