Revert of [es6] Introduce spec compliant IsConstructor.

src/scopes.h

Index: src/scopes.h
diff --git a/src/scopes.h b/src/scopes.h
index 61bf6338f7cd2ecd9b8e884c65efdd2df0881c50..d9aac2f7e5ff96b2616e8ccaff81391ddeabb277 100644
--- a/src/scopes.h
+++ b/src/scopes.h
@@ -347,7 +347,7 @@
     return scope_uses_super_property_ ||
            (scope_calls_eval_ && (IsConciseMethod(function_kind()) ||
                                   IsAccessorFunction(function_kind()) ||
-                                  IsClassConstructor(function_kind())));
+                                  IsConstructor(function_kind())));
   }
 
   const Scope* NearestOuterEvalScope() const {
@@ -445,7 +445,7 @@
   Variable* this_function_var() const {
     // This is only used in derived constructors atm.
     DCHECK(this_function_ == nullptr ||
-           (is_function_scope() && (IsClassConstructor(function_kind()) ||
+           (is_function_scope() && (IsConstructor(function_kind()) ||
                                     IsConciseMethod(function_kind()) ||
                                     IsAccessorFunction(function_kind()))));
     return this_function_;