Fix deoptimization triggers

This commit is contained in:
tophf 2017-03-22 10:07:34 +03:00
parent 95e2263c10
commit 07bee69359
2 changed files with 7 additions and 4 deletions

View File

@ -1551,8 +1551,8 @@ function showKeyMapHelp() {
cell.innerHTML = cell.textContent; cell.innerHTML = cell.textContent;
}); });
} }
function mergeKeyMaps(merged) { function mergeKeyMaps(merged, ...more) {
[].slice.call(arguments, 1).forEach(function(keyMap) { more.forEach(keyMap => {
if (typeof keyMap == "string") { if (typeof keyMap == "string") {
keyMap = CodeMirror.keyMap[keyMap]; keyMap = CodeMirror.keyMap[keyMap];
} }

View File

@ -183,7 +183,10 @@ function wildcardAsRegExp(s, flags) {
} }
var configureCommands = { // isolate deoptimization trigger:
// https://github.com/petkaantonov/bluebird/wiki/Optimization-killers
// * Functions that contain object literals that contain __proto__, or get or set declarations.
const configureCommands = (() => ({
get url () { get url () {
return navigator.userAgent.indexOf('OPR') > -1 ? return navigator.userAgent.indexOf('OPR') > -1 ?
'opera://settings/configureCommands' : 'opera://settings/configureCommands' :
@ -194,4 +197,4 @@ var configureCommands = {
'url': configureCommands.url 'url': configureCommands.url
}); });
} }
}; }))();