diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py index b7e5c6cf60c9..957b40f601e6 100644 --- a/config/check_spidermonkey_style.py +++ b/config/check_spidermonkey_style.py @@ -317,10 +317,6 @@ def is_module_header(enclosing_inclname, header_inclname): if m is not None and module.endswith('/' + m.group(1)): return True - # A weird public header case. - if module == 'jsmemorymetrics' and header_inclname == 'js/MemoryMetrics.h': - return True - return False diff --git a/js/src/config/check_spidermonkey_style.py b/js/src/config/check_spidermonkey_style.py index b7e5c6cf60c9..957b40f601e6 100644 --- a/js/src/config/check_spidermonkey_style.py +++ b/js/src/config/check_spidermonkey_style.py @@ -317,10 +317,6 @@ def is_module_header(enclosing_inclname, header_inclname): if m is not None and module.endswith('/' + m.group(1)): return True - # A weird public header case. - if module == 'jsmemorymetrics' and header_inclname == 'js/MemoryMetrics.h': - return True - return False diff --git a/js/src/moz.build b/js/src/moz.build index 66c46490727d..b0ef128b9396 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -99,6 +99,7 @@ CPP_SOURCES += [ 'MapObject.cpp', 'Marking.cpp', 'Memory.cpp', + 'MemoryMetrics.cpp', 'Module.cpp', 'Monitor.cpp', 'NameFunctions.cpp', @@ -164,7 +165,6 @@ CPP_SOURCES += [ 'jsinfer.cpp', 'jsiter.cpp', 'jsmath.cpp', - 'jsmemorymetrics.cpp', 'jsnativestack.cpp', 'jsnum.cpp', 'jsobj.cpp', diff --git a/js/src/jsmemorymetrics.cpp b/js/src/vm/MemoryMetrics.cpp similarity index 100% rename from js/src/jsmemorymetrics.cpp rename to js/src/vm/MemoryMetrics.cpp