Deprecate EM_LOG_FUNC_PARAMS flag to emscripten_log/emscripten_get_callstack

Supporting this flag requires using `arguments.callee` which is
deprecated, and won't work if any of functions on the callstack are in
strict mode (or are arrow function, which implies strict mode).

This effects of these flag seem to not actually be tested, even though
it is used in `test_emscripten_log`.

Author: sbc100

site/source/docs/api_reference/emscripten.h.rst

@@ -1042,10 +1042,6 @@ Defines
 
   If specified, the pathnames of the file information in the call stack will be omitted.
 
-.. c:macro:: EM_LOG_FUNC_PARAMS
-
-  If specified, prints out the actual values of the parameters the functions were invoked with.
-
 
 Functions
 ---------

src/generated_struct_info32.json

@@ -220,9 +220,7 @@
         "EM_LOG_CONSOLE": 1,
         "EM_LOG_C_STACK": 8,
         "EM_LOG_DEBUG": 256,
-        "EM_LOG_DEMANGLE": 32,
         "EM_LOG_ERROR": 4,
-        "EM_LOG_FUNC_PARAMS": 128,
         "EM_LOG_INFO": 512,
         "EM_LOG_JS_STACK": 16,
         "EM_LOG_NO_PATHS": 64,

src/generated_struct_info64.json

@@ -220,9 +220,7 @@
         "EM_LOG_CONSOLE": 1,
         "EM_LOG_C_STACK": 8,
         "EM_LOG_DEBUG": 256,
-        "EM_LOG_DEMANGLE": 32,
         "EM_LOG_ERROR": 4,
-        "EM_LOG_FUNC_PARAMS": 128,
         "EM_LOG_INFO": 512,
         "EM_LOG_JS_STACK": 16,
         "EM_LOG_NO_PATHS": 64,

src/library.js

@@ -2453,10 +2453,6 @@ mergeInto(LibraryManager.library, {
     var iNextLine = callstack.indexOf('\n', Math.max(iThisFunc, iThisFunc2))+1;
     callstack = callstack.slice(iNextLine);
 
-    if (flags & {{{ cDefs.EM_LOG_DEMANGLE }}}) {
-      warnOnce('EM_LOG_DEMANGLE is deprecated; ignoring');
-    }
-
     // If user requested to see the original source stack, but no source map
     // information is available, just fall back to showing the JS stack.
     if (flags & {{{ cDefs.EM_LOG_C_STACK }}} && typeof emscripten_source_map == 'undefined') {
@@ -2465,15 +2461,6 @@ mergeInto(LibraryManager.library, {
       flags |= {{{ cDefs.EM_LOG_JS_STACK }}};
     }
 
-    var stack_args = null;
-    if (flags & {{{ cDefs.EM_LOG_FUNC_PARAMS }}}) {
-      // To get the actual parameters to the functions, traverse the stack via
-      // the unfortunately deprecated 'arguments.callee' method, if it works:
-      stack_args = traverseStack(arguments);
-      while (stack_args[1].includes('_emscripten_'))
-        stack_args = traverseStack(stack_args[0]);
-    }
-
     // Process all lines:
     var lines = callstack.split('\n');
     callstack = '';
@@ -2537,16 +2524,6 @@ mergeInto(LibraryManager.library, {
         }
         callstack += (haveSourceMap ? (`     = ${symbolName}`) : (`    at ${symbolName}`)) + ` (${file}:${lineno}:${column})\n`;
       }
-
-      // If we are still keeping track with the callstack by traversing via
-      // 'arguments.callee', print the function parameters as well.
-      if (flags & {{{ cDefs.EM_LOG_FUNC_PARAMS }}} && stack_args[0]) {
-        if (stack_args[1] == symbolName && stack_args[2].length > 0) {
-          callstack = callstack.replace(/\s+$/, '');
-          callstack += ' with values: ' + stack_args[1] + stack_args[2] + '\n';
-        }
-        stack_args = traverseStack(stack_args[0]);
-      }
     }
     // Trim extra whitespace at the end of the output.
     callstack = callstack.replace(/\s+$/, '');

src/struct_info.json

@@ -978,9 +978,7 @@
             "EM_LOG_ERROR",
             "EM_LOG_C_STACK",
             "EM_LOG_JS_STACK",
-            "EM_LOG_DEMANGLE",
             "EM_LOG_NO_PATHS",
-            "EM_LOG_FUNC_PARAMS",
             "EM_LOG_DEBUG",
             "EM_LOG_INFO",
             "EM_TIMING_SETTIMEOUT",

system/include/emscripten/emscripten.h

@@ -155,8 +155,10 @@ char *emscripten_get_preloaded_image_data_from_FILE(FILE *file, int *w, int *h);
 #define EM_LOG_C_STACK   8
 #define EM_LOG_JS_STACK 16
 #define EM_LOG_DEMANGLE 32  // deprecated
+#pragma clang deprecated(EM_LOG_DEMANGLE)
 #define EM_LOG_NO_PATHS 64
-#define EM_LOG_FUNC_PARAMS 128
+#define EM_LOG_FUNC_PARAMS 128  // deprecated
+#pragma clang deprecated(EM_LOG_FUNC_PARAMS)
 #define EM_LOG_DEBUG    256
 #define EM_LOG_INFO     512
 

test/test_core.py

@@ -8035,7 +8035,7 @@ def test_emscripten_log(self):
     self.set_setting('DEMANGLE_SUPPORT')
     if '-g' not in self.emcc_args:
       self.emcc_args.append('-g')
-    self.emcc_args += ['-DRUN_FROM_JS_SHELL']
+    self.emcc_args += ['-DRUN_FROM_JS_SHELL', '-Wno-deprecated-pragma']
     self.do_run_in_out_file_test('emscripten_log/emscripten_log.cpp', interleaved_output=False)
     # test closure compiler as well
     if self.maybe_closure():