Skip to content

Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorBo merged 8 commits into from
Jul 10, 2022
Merged

Propagate typeof() during inlining #71778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2c81bb
Propagate typeof() during inlining
EgorBo Jul 7, 2022
ac821f5
test
EgorBo Jul 8, 2022
b8df761
Clean up
EgorBo Jul 8, 2022
906c097
test
EgorBo Jul 9, 2022
f60d6f6
fold typeof() != null
EgorBo Jul 9, 2022
d4ecae9
Update src/coreclr/jit/gentree.cpp
EgorBo Jul 9, 2022
a5f4e3e
clean up
EgorBo Jul 9, 2022
262c9d3
clean up
EgorBo Jul 10, 2022
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
13 changes: 2 additions & 11 deletions src/coreclr/jit/fginline.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
}
else
{
/* The argument is either not used or a const or lcl var */

// The argument is either not used or a const or lcl var
noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

/* Make sure we didnt change argNode's along the way, or else
subsequent uses of the arg would have worked with the bashed value */
if (argInfo.argIsInvariant)
{
assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
}
noway_assert((argInfo.argIsLclVar == 0) ==
(argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

/* If the argument has side effects, append it */

// If the argument has side effects, append it
if (argInfo.argHasSideEff)
{
noway_assert(argInfo.argIsUsed == false);
Expand Down
19 changes: 11 additions & 8 deletions src/coreclr/jit/gentree.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

// Screen for the right kinds of operands
GenTree* const op1 = tree->AsOp()->gtOp1;
const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
if (op1Kind == TPK_Unknown)
{
return tree;
}

GenTree* const op2 = tree->AsOp()->gtOp2;
const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
if (op2Kind == TPK_Unknown)

// Fold "typeof(handle) cmp null"
if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
{
return tree;
GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
{
return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
}
}

// If both types are created via handles, we can simply compare
Expand Down
21 changes: 14 additions & 7 deletions src/coreclr/jit/importer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
return;
}
}
else
{
if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
(gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.
{
inlCurArgInfo->argIsInvariant = true;
inlCurArgInfo->argHasSideEff = false;
}
}

bool isExact = false;
bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
}
if (inlCurArgInfo->argIsInvariant)
{
printf(" is a constant");
printf(" is a constant or invariant");
}
if (inlCurArgInfo->argHasGlobRef)
{
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
// Try to fold the node in case we have constant arguments.
if (inlArgInfo[i].argIsInvariant)
{
inlArgNode = gtFoldExprConst(inlArgNode);
assert(inlArgNode->OperIsConst());
inlArgNode = gtFoldExpr(inlArgNode);
}
*pInlArgNode = inlArgNode;
}
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

inlArgInfo[i].argIsLclVar = false;

/* Try to fold the node in case we have constant arguments */

// Try to fold the node in case we have constant arguments.
if (inlArgInfo[i].argIsInvariant)
{
inlArgNode = gtFoldExprConst(inlArgNode);
assert(inlArgNode->OperIsConst());
inlArgNode = gtFoldExpr(inlArgNode);
}
*pInlArgNode = inlArgNode;
}
Expand Down
, '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" + '
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down

, '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('^' + ".*" + '
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down

, '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('^' + ".*" + '
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down

, '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" + '
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down

, '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('^' + ".*" + '
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down

, '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('^' + ".*" + '
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down

, '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); }
})();
})();
Propagate typeof() during inlining by EgorBo · Pull Request #71778 · dotnet/runtime · GitHub
Skip to content
Propagate typeof() during inlining#71778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EgorBo
merged 8 commits into

from

Jul 10, 2022
 Merged


Propagate typeof() during inlining
#71778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c2c81bb

Propagate typeof() during inlining


EgorBo Jul 7, 2022
ac821f5

test


EgorBo Jul 8, 2022
b8df761

Clean up


EgorBo Jul 8, 2022
906c097

test


EgorBo Jul 9, 2022
f60d6f6

fold typeof() != null


EgorBo Jul 9, 2022
d4ecae9

Update src/coreclr/jit/gentree.cpp


EgorBo Jul 9, 2022
a5f4e3e

clean up


EgorBo Jul 9, 2022
262c9d3

clean up


EgorBo Jul 10, 2022

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


13 changes: 2 additions & 11 deletions
src/coreclr/jit/fginline.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
 }
 else
 {
 /* The argument is either not used or a const or lcl var */

 // The argument is either not used or a const or lcl var
 noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

 /* Make sure we didnt change argNode's along the way, or else
 subsequent uses of the arg would have worked with the bashed value */
 if (argInfo.argIsInvariant)
 {
 assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
 }
 noway_assert((argInfo.argIsLclVar == 0) ==
 (argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

 /* If the argument has side effects, append it */

 // If the argument has side effects, append it
 if (argInfo.argHasSideEff)
 {
 noway_assert(argInfo.argIsUsed == false);
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12896,6 +12896,7 @@ GenTree* Compiler::gtCreateHandleCompare(genTreeOps oper,
// Checks for
// typeof(...) == obj.GetType()
// typeof(...) == typeof(...)
// typeof(...) == null
// obj1.GetType() == obj2.GetType()
//
// And potentially optimizes away the need to obtain actual
Expand All@@ -12913,17 +12914,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

 // Screen for the right kinds of operands
 GenTree* const op1 = tree->AsOp()->gtOp1;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 if (op1Kind == TPK_Unknown)
 {
 return tree;
 }

 GenTree* const op2 = tree->AsOp()->gtOp2;
 const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
 const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
 if (op2Kind == TPK_Unknown)

 // Fold "typeof(handle) cmp null"
 if (((op2Kind == TPK_Null) && (op1Kind == TPK_Handle)) || ((op1Kind == TPK_Null) && (op2Kind == TPK_Handle)))
 {
 return tree;
 GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
 GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
 if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
 {
 return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
 }
 }

 // If both types are created via handles, we can simply compare
Expand Down

21 changes: 14 additions & 7 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20206,6 +20206,16 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 return;
 }
 }
 else
 {
 if (curArgVal->IsHelperCall() && gtIsTypeHandleToRuntimeTypeHelper(curArgVal->AsCall()) &&
 (gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
 NO_CLASS_HANDLE))
Comment thread
EgorBo marked this conversation as resolved.

 {
 inlCurArgInfo->argIsInvariant = true;
 inlCurArgInfo->argHasSideEff = false;
 }
 }

 bool isExact = false;
 bool isNonNull = false;
Expand DownExpand Up@@ -20242,7 +20252,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 }
 if (inlCurArgInfo->argIsInvariant)
 {
 printf(" is a constant");
 printf(" is a constant or invariant");
 }
 if (inlCurArgInfo->argHasGlobRef)
 {
Expand DownExpand Up@@ -20510,8 +20520,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand All@@ -20523,12 +20532,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

 inlArgInfo[i].argIsLclVar = false;

 /* Try to fold the node in case we have constant arguments */

 // Try to fold the node in case we have constant arguments.
 if (inlArgInfo[i].argIsInvariant)
 {
 inlArgNode = gtFoldExprConst(inlArgNode);
 assert(inlArgNode->OperIsConst());
 inlArgNode = gtFoldExpr(inlArgNode);
 }
 *pInlArgNode = inlArgNode;
 }
Expand Down