From deedfef644731fdc84f67aa6ce6f1c5af44f85f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 22 Nov 2018 18:38:16 +0100 Subject: [PATCH] Narrow the assert in fgLateDevirtualization (dotnet/coreclr#21163) As suggested by Andy in dotnet/corertdotnet/coreclr#6601. Commit migrated from https://github.com/dotnet/coreclr/commit/00279ca6204b581fed9347a24929f28d74737384 --- src/coreclr/src/jit/flowgraph.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/jit/flowgraph.cpp b/src/coreclr/src/jit/flowgraph.cpp index bcc818f25..eba0c0b 100644 --- a/src/coreclr/src/jit/flowgraph.cpp +++ b/src/coreclr/src/jit/flowgraph.cpp @@ -22399,9 +22399,9 @@ Compiler::fgWalkResult Compiler::fgLateDevirtualization(GenTree** pTree, fgWalkD // jit\Methodical\VT\callconv\_il_reljumper3 for x64 linux // // If so, just bail out here. - if ((parent != nullptr) && parent->OperGet() == GT_NOP) + if (tree == nullptr) { - assert(tree == nullptr); + assert((parent != nullptr) && parent->OperGet() == GT_NOP); return WALK_CONTINUE; } -- 2.7.4