Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions src/coreclr/jit/assertionprop.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1337,55 +1337,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1, GenTree* op2, bool equ
return NO_ASSERTION_INDEX;
}

/*****************************************************************************
*
* If tree is a constant node holding an integral value, retrieve the value in
* pConstant. If the method returns true, pConstant holds the appropriate
* constant. Set "vnBased" to true to indicate local or global assertion prop.
* "pFlags" indicates if the constant is a handle marked by GTF_ICON_HDL_MASK.
*/
bool Compiler::optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pFlags)
{
// Is Local assertion prop?
if (!vnBased)
{
if (tree->OperIs(GT_CNS_INT))
{
*pConstant = tree->AsIntCon()->IconValue();
*pFlags = tree->GetIconHandleFlag();
return true;
}
return false;
}

// Global assertion prop
ValueNum vn = vnStore->VNConservativeNormalValue(tree->gtVNPair);
if (!vnStore->IsVNConstant(vn))
{
return false;
}

// ValueNumber 'vn' indicates that this node evaluates to a constant

var_types vnType = vnStore->TypeOfVN(vn);
if (vnType == TYP_INT)
{
*pConstant = vnStore->ConstantValue<int>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#ifdef TARGET_64BIT
else if (vnType == TYP_LONG)
{
*pConstant = vnStore->ConstantValue<INT64>(vn);
*pFlags = vnStore->IsVNHandle(vn) ? vnStore->GetHandleFlags(vn) : GTF_EMPTY;
return true;
}
#endif

return false;
}

/*****************************************************************************
*
* Given an assertion add it to the assertion table
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9075,7 +9075,6 @@ class Compiler
// Assertion prop data flow functions.
PhaseStatus optAssertionPropMain();
Statement* optVNAssertionPropCurStmt(BasicBlock* block, Statement* stmt);
bool optIsTreeKnownIntValue(bool vnBased, GenTree* tree, ssize_t* pConstant, GenTreeFlags* pIconFlags);
ASSERT_TP* optInitAssertionDataflowFlags();
ASSERT_TP* optComputeAssertionGen();

Expand Down
73 changes: 9 additions & 64 deletions src/coreclr/jit/rangecheck.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,73 +272,15 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
m_preferredBound = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
GenTree* treeIndex = bndsChk->GetIndex();
GenTree* comma = treeParent->OperIs(GT_COMMA) ? treeParent : nullptr;
GenTreeBoundsChk* bndsChk = tree->AsBoundsChk();
GenTree* treeIndex = bndsChk->GetIndex();

// Take care of constant index first, like a[2], for example.
ValueNum idxVn = m_compiler->vnStore->VNConservativeNormalValue(treeIndex->gtVNPair);
ValueNum arrLenVn = m_compiler->vnStore->VNConservativeNormalValue(bndsChk->GetArrayLength()->gtVNPair);
int arrSize = 0;
ValueNum idxVn = m_compiler->optConservativeNormalVN(treeIndex);
ValueNum arrLenVn = m_compiler->optConservativeNormalVN(bndsChk->GetArrayLength());

if (m_compiler->vnStore->IsVNConstant(arrLenVn))
{
ssize_t constVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;

if (m_compiler->optIsTreeKnownIntValue(true, bndsChk->GetArrayLength(), &constVal, &iconFlags))
{
arrSize = (int)constVal;
}
}
else
{
arrSize = GetArrLength(arrLenVn);

// if we can't find the array length, see if there
// are any assertions about the array size we can use to get a minimum length
if (arrSize <= 0)
{
JITDUMP("Looking for array size assertions for: " FMT_VN "\n", arrLenVn);
Range arrLength = Range(Limit(Limit::keDependent));
MergeEdgeAssertions(m_compiler, arrLenVn, arrLenVn, block->bbAssertionIn, &arrLength);
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
else
{
// Fast path didn't find anything - do the slow SSA-based search.
arrLength = GetRangeWorker(block, bndsChk->GetArrayLength(), false DEBUGARG(0));
if (arrLength.lLimit.IsConstant())
{
arrSize = arrLength.lLimit.GetConstant();
}
}
}
}

JITDUMP("ArrSize for lengthVN:%03X = %d\n", arrLenVn, arrSize);
if (m_compiler->vnStore->IsVNConstant(idxVn) && (arrSize > 0))
{
ssize_t idxVal = -1;
GenTreeFlags iconFlags = GTF_EMPTY;
if (!m_compiler->optIsTreeKnownIntValue(true, treeIndex, &idxVal, &iconFlags))
{
return;
}

JITDUMP("[RangeCheck::OptimizeRangeCheck] Is index %d in <0, arrLenVn " FMT_VN " sz:%d>.\n", idxVal, arrLenVn,
arrSize);
if ((idxVal < arrSize) && (idxVal >= 0))
{
JITDUMP("Removing range check\n");
m_compiler->optRemoveRangeCheck(bndsChk, comma, stmt);
m_updateStmt = true;
return;
}
}
m_preferredBound = arrLenVn;

// Special case: arr[arr.Length - CNS] if we know that arr.Length >= CNS
// We assume that SUB(x, CNS) is canonized into ADD(x, -CNS)
Expand DownExpand Up@@ -428,6 +370,9 @@ void RangeCheck::OptimizeRangeCheck(BasicBlock* block, Statement* stmt, GenTree*
return;
}

Range arrSizeRng = GetRangeFromAssertions(m_compiler, arrLenVn, block->bbAssertionIn);
int arrSize = arrSizeRng.LowerLimit().GetConstant();

Comment thread
EgorBo marked this conversation as resolved.
// Is the range between the lower and upper bound values.
if (BetweenBounds(range, bndsChk->GetArrayLength(), arrSize))
{
Expand Down
Loading