From 1bcc571739d7228db0bc947ee67c20dde5aeb7e0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 9 Nov 2016 16:06:29 -0500
Subject: [PATCH] Revert "fix #4041, warn overriding Vue's internal methods
 (#4111)"

This reverts commit 4078ce9c58830fecff095ab96dc41693377794dd.
---
 src/core/instance/state.js                 | 10 ++--------
 test/unit/features/options/methods.spec.js | 10 ----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/core/instance/state.js b/src/core/instance/state.js
index 84697493..36a8d3fb 100644
--- a/src/core/instance/state.js
+++ b/src/core/instance/state.js
@@ -21,8 +21,6 @@ import {
   noop
 } from '../util/index'
 
-import BuiltinVue from '../index'
-
 export function initState (vm: Component) {
   vm._watchers = []
   initProps(vm)
@@ -145,16 +143,12 @@ function initMethods (vm: Component) {
   if (methods) {
     for (const key in methods) {
       vm[key] = methods[key] == null ? noop : bind(methods[key], vm)
-      if (process.env.NODE_ENV !== 'production') {
-        methods[key] == null && warn(
+      if (process.env.NODE_ENV !== 'production' && methods[key] == null) {
+        warn(
           `method "${key}" has an undefined value in the component definition. ` +
           `Did you reference the function correctly?`,
           vm
         )
-        hasOwn(BuiltinVue.prototype, key) && warn(
-          `Avoid overriding Vue's internal method "${key}".`,
-          vm
-        )
       }
     }
   }
diff --git a/test/unit/features/options/methods.spec.js b/test/unit/features/options/methods.spec.js
index d9c54a85..3e699114 100644
--- a/test/unit/features/options/methods.spec.js
+++ b/test/unit/features/options/methods.spec.js
@@ -24,14 +24,4 @@ describe('Options methods', () => {
     })
     expect(`method "hello" has an undefined value in the component definition`).toHaveBeenWarned()
   })
-
-  it('should warn overriding builtin methods', () => {
-    new Vue({
-      methods: {
-        $emit () {
-        }
-      }
-    })
-    expect(`Avoid overriding Vue's internal method "$emit".`).toHaveBeenWarned()
-  })
 })