mozilla-inbound: changeset 237317:d0fc7202b4cbe1ac8de823ed9e1e6dad706fc4d0

author	Markus Stange <mstange@themasta.com>
	Wed, 01 Apr 2015 12:08:34 -0400
changeset 237317	d0fc7202b4cbe1ac8de823ed9e1e6dad706fc4d0
parent 237316	b25a2c3e600a19b59aa747257f09ca6a8b33d058
child 237318	1748feaa98e26b5f7ff57ac7b93c22bc03b660a8
push id	57925
push user	mstange@themasta.com
push date	Thu, 02 Apr 2015 18:55:45 +0000
treeherder	mozilla-inbound@d0fc7202b4cb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jrmuizel
bugs	1150642
milestone	40.0a1
first release with	nightly linux32 70a113676b21 / 40.0a1 / 20150403030204 / files nightly linux64 70a113676b21 / 40.0a1 / 20150403030204 / files nightly mac 70a113676b21 / 40.0a1 / 20150403030204 / files nightly win32 70a113676b21 / 40.0a1 / 20150403030204 / files nightly win64 70a113676b21 / 40.0a1 / 20150403030204 / files
last release without	nightly linux32 35046df9df1f / 40.0a1 / 20150402115822 / files nightly linux64 35046df9df1f / 40.0a1 / 20150402115824 / files nightly mac 35046df9df1f / 40.0a1 / 20150402115823 / files nightly win32 35046df9df1f / 40.0a1 / 20150402115824 / files nightly win64 35046df9df1f / 40.0a1 / 20150402115826 / files

--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -52,17 +52,21 @@ void mozilla_sampler_frame_number(int fr
 const double* mozilla_sampler_get_responsiveness();
 
 void mozilla_sampler_save();
 
 char* mozilla_sampler_get_profile();
 
 JSObject *mozilla_sampler_get_profile_data(JSContext *aCx);
 
-void mozilla_sampler_save_profile_to_file(const char* aFilename);
+// Make this function easily callable from a debugger in a build without
+// debugging information (work around http://llvm.org/bugs/show_bug.cgi?id=22211)
+extern "C" {
+  void mozilla_sampler_save_profile_to_file(const char* aFilename);
+}
 
 const char** mozilla_sampler_get_features();
 
 void mozilla_sampler_init(void* stackTop);
 
 void mozilla_sampler_shutdown();
 
 void mozilla_sampler_print_location1();