From 20ed47c5a16259b81a9e58246fcfb79cab9f692d Mon Sep 17 00:00:00 2001 From: ptarjan Date: Wed, 3 Apr 2013 21:21:28 -0700 Subject: [PATCH] kill dead code --- hphp/runtime/base/builtin_functions.cpp | 45 +------------------------ hphp/runtime/base/builtin_functions.h | 16 --------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp index bea21f5ae..36100b6be 100644 --- a/hphp/runtime/base/builtin_functions.cpp +++ b/hphp/runtime/base/builtin_functions.cpp @@ -567,33 +567,6 @@ void throw_pending_exception(ThreadInfo *info) { throw e; } -Variant throw_missing_arguments(const char *fn, int expected, int got, - int level /* = 0 */) { - throw_missing_arguments_nr(fn, expected, got, level); - return uninit_null(); -} - -Variant throw_toomany_arguments(const char *fn, int num, int level /* = 0 */) { - if (level == 2 || RuntimeOption::ThrowTooManyArguments) { - raise_error("Too many arguments for %s(), expected %d", fn, num); - } else if (level == 1 || RuntimeOption::WarnTooManyArguments) { - raise_warning("Too many arguments for %s(), expected %d", fn, num); - } - return uninit_null(); -} - -Variant throw_wrong_arguments(const char *fn, int count, int cmin, int cmax, - int level /* = 0 */) { - if (cmin >= 0 && count < cmin) { - return throw_missing_arguments(fn, cmin, count, level); - } - if (cmax >= 0 && count > cmax) { - return throw_toomany_arguments(fn, cmax, level); - } - assert(false); - return uninit_null(); -} - void throw_missing_arguments_nr(const char *fn, int expected, int got, int level /* = 0 */) { if (level == 2 || RuntimeOption::ThrowMissingArguments) { @@ -620,7 +593,7 @@ void throw_toomany_arguments_nr(const char *fn, int num, int level /* = 0 */) { } void throw_wrong_arguments_nr(const char *fn, int count, int cmin, int cmax, - int level /* = 0 */) { + int level /* = 0 */) { if (cmin >= 0 && count < cmin) { throw_missing_arguments_nr(fn, cmin, count, level); return; @@ -632,18 +605,6 @@ void throw_wrong_arguments_nr(const char *fn, int count, int cmin, int cmax, assert(false); } -Variant throw_missing_typed_argument(const char *fn, - const char *type, int arg) { - if (!type) { - raise_error("Argument %d passed to %s() must be an array, none given", - arg, fn); - } else { - raise_error("Argument %d passed to %s() must be " - "an instance of %s, none given", arg, fn, type); - } - return uninit_null(); -} - void throw_bad_type_exception(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -765,10 +726,6 @@ void throw_call_non_object(const char *methodName) { throw FatalErrorException(msg.c_str()); } -Variant throw_assign_this() { - throw FatalErrorException("Cannot re-assign $this"); -} - void throw_unexpected_argument_type(int argNum, const char *fnName, const char *expected, CVarRef val) { const char *otype = nullptr; diff --git a/hphp/runtime/base/builtin_functions.h b/hphp/runtime/base/builtin_functions.h index 4c394d5c9..96d22fe0c 100644 --- a/hphp/runtime/base/builtin_functions.h +++ b/hphp/runtime/base/builtin_functions.h @@ -415,14 +415,6 @@ Object create_object(CStrRef s, const Array ¶ms, bool init = true); * - When level is 1, it's from system funcs that turn both into warnings * - When level is 0, it's from user funcs that turn missing arg in warnings */ -Variant throw_missing_arguments(const char *fn, int expected, int got, - int level = 0); -Variant throw_toomany_arguments(const char *fn, int num, int level = 0); -Variant throw_wrong_arguments(const char *fn, int count, int cmin, int cmax, - int level = 0); -Variant throw_missing_typed_argument(const char *fn, const char *type, int arg); -Variant throw_assign_this(); - void throw_missing_arguments_nr(const char *fn, int expected, int got, int level = 0) __attribute__((cold)); @@ -430,14 +422,6 @@ void throw_toomany_arguments_nr(const char *fn, int num, int level = 0) __attribute__((cold)); void throw_wrong_arguments_nr(const char *fn, int count, int cmin, int cmax, int level = 0) __attribute__((cold)); - -/** - * When fatal coding errors are transformed to this function call. - */ -inline Object throw_fatal_object(const char *msg, void *dummy = nullptr) { - throw FatalErrorException(msg); -} - void throw_unexpected_argument_type(int argNum, const char *fnName, const char *expected, CVarRef val);