Disable tail calls inside Simple GM functions.

gm/gm.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef skiagm_DEFINED
 #define skiagm_DEFINED
 
@@ skipping 16 matching lines @@
 // rendering calls or make use of the onOnceBeforeDraw() virtual; it
 // consists of:
 //   *   A single void(*)(SkCanvas*) function.
 //   *   A name.
 //   *   Prefered width and height.
 //   *   Optionally, a background color (default is white).
 #define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \
     DEF_SIMPLE_GM_BG_NAME(NAME, CANVAS, W, H, SK_ColorWHITE, SkString(#NAME))
 #define DEF_SIMPLE_GM_BG(NAME, CANVAS, W, H, BGCOLOR)\
     DEF_SIMPLE_GM_BG_NAME(NAME, CANVAS, W, H, BGCOLOR, SkString(#NAME))
-#define DEF_SIMPLE_GM_BG_NAME(NAME, CANVAS, W, H, BGCOLOR, NAME_STR)         \
-    static void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas * CANVAS);               \
-    DEF_GM(return new skiagm::SimpleGM(NAME_STR, SK_MACRO_CONCAT(NAME, _GM), \
-                                       SkISize::Make(W, H), BGCOLOR);)       \
+
+// Disable tail calls in Simple GM functions to make sure they appear on any stack trace.
+#if defined(__clang__)
+    #define DISABLE_TAIL_CALLS __attribute__((optnone))
+#elif defined(__GNUC__)
+    #define DISABLE_TAIL_CALLS __attribute__((optimize("-O1")))
+#else
+    #define DISABLE_TAIL_CALLS /*TODO: MSVC*/
+#endif
+
+#define DEF_SIMPLE_GM_BG_NAME(NAME, CANVAS, W, H, BGCOLOR, NAME_STR)              \
+    static void DISABLE_TAIL_CALLS SK_MACRO_CONCAT(NAME, _GM)(SkCanvas * CANVAS); \
+    DEF_GM(return new skiagm::SimpleGM(NAME_STR, SK_MACRO_CONCAT(NAME, _GM),      \
+                                       SkISize::Make(W, H), BGCOLOR);)            \
     void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas * CANVAS)
 
 namespace skiagm {
 
     class GM {
     public:
         GM();
         virtual ~GM();
 
         enum Mode {
@@ skipping 92 matching lines @@
         SkISize onISize() override;
         SkString onShortName() override;
     private:
         SkString fName;
         void (*fDrawProc)(SkCanvas*);
         SkISize fSize;
     };
 }
 
 #endif