Skip to content

Commit

Permalink
Merge pull request #13118 from raido/bug-fix-13071
Browse files Browse the repository at this point in the history
[BUGFIX release] Fix for #13071 V8 inlining bug
  • Loading branch information
rwjblue committed Mar 17, 2016
2 parents 03cfc7d + a6b09b3 commit 92e3160
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion packages/ember-htmlbars/lib/system/lookup-helper.js
Expand Up @@ -39,7 +39,10 @@ function _findHelper(name, view, env, options) {
let owner = env.owner;
if (validateLazyHelperName(name, owner, env.hooks.keywords)) {
var helperName = 'helper:' + name;
if (owner.hasRegistration(helperName, options)) {
// See https://github.com/emberjs/ember.js/issues/13071
// See https://bugs.chromium.org/p/v8/issues/detail?id=4839
var registered = owner.hasRegistration(helperName, options);
if (registered) {
helper = owner._lookupFactory(helperName, options);
assert(`Expected to find an Ember.Helper with the name ${helperName}, but found an object of type ${typeof helper} instead.`, helper.isHelperFactory || helper.isHelperInstance);
}
Expand Down

0 comments on commit 92e3160

Please sign in to comment.