Merge pull request #25 from goccy/fix-checkptr-error

Fix checkptr error
goccy · Dec 6, 2022 · 234d8c6 · 234d8c6
2 parents b6d23c3 + c9b6bcb
commit 234d8c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -20,7 +20,7 @@ jobs:
     - name: checkout
       uses: actions/checkout@v2
     - name: test
-      run: go test -v ./ -count=1
+      run: go test -race -v ./ -count=1
       env:
         CC: clang
         CXX: clang++
diff --git a/internal/helper/bind.go b/internal/helper/bind.go
@@ -55,6 +55,10 @@ func PtrToSlice(p unsafe.Pointer, cb func(unsafe.Pointer)) {
 	}
 }
 
+func IntPtr(v int) unsafe.Pointer {
+	return *(*unsafe.Pointer)(unsafe.Pointer(&v))
+}
+
 func SliceToPtr(v interface{}, cb func(int) unsafe.Pointer) unsafe.Pointer {
 	rv := reflect.ValueOf(v)
 	slice := (*reflect.SliceHeader)(C.malloc(C.ulong(unsafe.Sizeof(reflect.SliceHeader{}))))

diff --git a/language_options.go b/language_options.go
@@ -52,7 +52,7 @@ func (o *LanguageOptions) SupportsStatementKind(kind resolved_ast.Kind) bool {
 // explicitly opt in to support other statements.
 func (o *LanguageOptions) SetSupportedStatementKinds(kinds []resolved_ast.Kind) {
 	internal.LanguageOptions_SetSupportedStatementKinds(o.raw, helper.SliceToPtr(kinds, func(i int) unsafe.Pointer {
-		return unsafe.Pointer(uintptr(int(kinds[i])))
+		return helper.IntPtr(int(kinds[i]))
 	}))
 }
 
@@ -91,7 +91,7 @@ func (o *LanguageOptions) EnableLanguageFeature(feature LanguageFeature) {
 
 func (o *LanguageOptions) SetEnabledLanguageFeatures(features []LanguageFeature) {
 	internal.LanguageOptions_SetEnabledLanguageFeatures(o.raw, helper.SliceToPtr(features, func(i int) unsafe.Pointer {
-		return unsafe.Pointer(uintptr(int(features[i])))
+		return helper.IntPtr(int(features[i]))
 	}))
 }