Try to enable shared ptr debug for CI

Author: mgreter

.github/workflows/build-and-test.yml

@@ -44,8 +44,8 @@ jobs:
     env:
       ASAN_OPTIONS: ${{ matrix.config.asan }}
       AUTOTOOLS: ${{ matrix.config.autotools }}
-      EXTRA_CFLAGS: ${{ matrix.config.cflags }}
-      EXTRA_CXXFLAGS: ${{ matrix.config.cflags }}
+      EXTRA_CFLAGS: ${{ matrix.config.cflags }} -DDEBUG_SHARED_PTR
+      EXTRA_CXXFLAGS: ${{ matrix.config.cflags }} -DDEBUG_SHARED_PTR
       EXTRA_LDFLAGS: ${{ matrix.config.cflags }}
       SASS_LIBSASS_PATH: libsass
       COVERAGE: no
@@ -178,7 +178,7 @@ jobs:
     - name: Clone and checkout sass-spec repository
       run: git clone https://github.com/mgreter/sass-spec.git --branch refactor/libsass-4-alpha
     - name: Compile libsass ${{ matrix.config.build }} build for ${{ matrix.config.platform }}
-      run: msbuild /m:4 /p:Configuration=${{ matrix.config.build }} /p:Platform=${{ matrix.config.platform }} sassc\win\sassc.sln
+      run: msbuild /m:4 /p:Configuration=${{ matrix.config.build }} /p:Platform=${{ matrix.config.platform }} /p:DefineConstants="DEBUG_SHARED_PTR" sassc\win\sassc.sln
     - name: Check sassc help call
       run: sassc\bin\sassc.exe --term-colors --help
     - name: Execute spec test runner
@@ -193,10 +193,17 @@ jobs:
       # fail-fast: false
       matrix:
         config:
-          - {build: shared, platform: x64}
-          - {build: static, platform: x64}
-          - {build: shared, platform: x86}
-          - {build: static, platform: x86}
+          - {build: shared, platform: x64, cflags: '-g -fsanitize=address'}
+          - {build: static, platform: x64, cflags: '-g -fsanitize=address'}
+          - {build: shared, platform: x86, cflags: '-g -fsanitize=address'}
+          - {build: static, platform: x86, cflags: '-g -fsanitize=address'}
+
+    env:
+      ASAN_OPTIONS: ${{ matrix.config.asan }}
+      EXTRA_CFLAGS: ${{ matrix.config.cflags }} -DDEBUG_SHARED_PTR
+      EXTRA_CXXFLAGS: ${{ matrix.config.cflags }} -DDEBUG_SHARED_PTR
+      SASS_LIBSASS_PATH: libsass
+      COVERAGE: no
 
     steps:
     - name: Change git config to preserve line-endings

src/ast_nodes.cpp

@@ -126,10 +126,6 @@ namespace Sass {
     ModRule(
       prev, url,
       import)
-    // sheet_(sheet),
-    // prev_(prev),
-    // url_(url),
-    // module_(nullptr)
   {}
 
   //////////////////////////////////////////////////////////////////////

src/cencode.cpp

@@ -10,6 +10,9 @@
 
 namespace base64 {
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
   void base64_init_encodestate(base64_encodestate* state_in)
   {
     state_in->step = step_A;
@@ -106,4 +109,7 @@ namespace base64 {
     return (int)(codechar - code_out);
   }
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
 }

src/color_maps.cpp

@@ -8,7 +8,10 @@
 namespace Sass
 {
 
-	namespace ColorNames
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
+  namespace ColorNames
 	{
 		const char aliceblue[] = "aliceblue";
 		const char antiquewhite[] = "antiquewhite";
@@ -161,7 +164,10 @@ namespace Sass
 		const char transparent[] = "transparent";
 	} // namespace ColorNames
 
-	namespace Colors
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
+  namespace Colors
 	{
 		const SourceSpan color_table(SourceSpan::internal("[COLOR TABLE]"));
 		const ColorRgba aliceblue(color_table, 240, 248, 255, 1);
@@ -315,7 +321,10 @@ namespace Sass
 		const ColorRgba transparent(color_table, 0, 0, 0, 0);
 	} // namespace Colors
 
-	static const auto* const colors_to_names = new std::unordered_map<int, const char*>{
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
+  static const auto* const colors_to_names = new std::unordered_map<int, const char*>{
 		{240 * 0x10000 + 248 * 0x100 + 255, ColorNames::aliceblue},
 		{250 * 0x10000 + 235 * 0x100 + 215, ColorNames::antiquewhite},
 		{0 * 0x10000 + 255 * 0x100 + 255, ColorNames::cyan},
@@ -456,6 +465,9 @@ namespace Sass
 		{154 * 0x10000 + 205 * 0x100 + 50, ColorNames::yellowgreen},
 		{102 * 0x10000 + 51 * 0x100 + 153, ColorNames::rebeccapurple}};
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
 	static const auto* const names_to_colors =
 		new std::unordered_map<sass::string, const ColorRgba*>{
 			{ColorNames::aliceblue, &Colors::aliceblue},
@@ -608,6 +620,9 @@ namespace Sass
 			{ColorNames::rebeccapurple, &Colors::rebeccapurple},
 			{ColorNames::transparent, &Colors::transparent}};
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
 	const ColorRgba* name_to_color(const char* key)
 	{
 		return name_to_color(sass::string(key));
@@ -648,9 +663,7 @@ namespace Sass
 		return nullptr;
 	}
 
-	const char* color_to_name(const double key)
-	{
-		return color_to_name((int)key);
-	}
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
 
 } // namespace Sass

src/color_maps.hpp

@@ -320,7 +320,6 @@ namespace Sass {
   const ColorRgba* name_to_color(const char*);
   const ColorRgba* name_to_color(const sass::string&);
   const char* color_to_name(const int);
-  const char* color_to_name(const double);
 
 }
 

src/eval.cpp

@@ -721,7 +721,7 @@ namespace Sass {
             ColorRgbaObj rgba = color->toRGBA();
             double numval = rgba->r() * 0x10000
               + rgba->g() * 0x100 + rgba->b();
-            if (const char* disp = color_to_name(numval)) {
+            if (const char* disp = color_to_name((int)numval)) {
               sass::sstream msg;
               msg << "You probably don't mean to use the color value ";
               msg << disp << " in interpolation here.\nIt may end up represented ";

src/inspect.cpp

@@ -799,8 +799,8 @@ namespace Sass {
     // otherwise get the possible resolved color name
     else {
       double numval = r * 0x10000 + g * 0x100 + b;
-      if (color_to_name(numval))
-        res_name = color_to_name(numval);
+      if (color_to_name((int)numval))
+        res_name = color_to_name((int)numval);
     }
 
     sass::sstream hexlet;

src/memory/allocator.cpp

@@ -8,11 +8,17 @@
 
 namespace Sass {
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
   // You must only use PODs for thread_local.
   // Objects get very unpredictable init order.
   static thread_local MemoryPool* pool;
   static thread_local size_t allocations;
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
   // Allocate memory from the memory pool.
   // Memory pool is allocated on first call.
   void* allocateMem(size_t size)
@@ -43,6 +49,9 @@ namespace Sass {
 
   }
 
+  /////////////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////
+
 }
 
 #endif