Feat/improving ffi

cmake/importCairo.cmake

@@ -13,15 +13,9 @@ if (BUILD_BUNDLE)
       add_third_party_dependency("libpng-1.6.37")
     endif()
   elseif(OSX)
-    If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
-      add_third_party_dependency("pixman-0.40.0")
-      add_third_party_dependency("cairo-1.17.4")
-      add_third_party_dependency("libpng-1.6.37")
-    else()
-      add_third_party_dependency("pixman-0.40.0")
-      add_third_party_dependency("cairo-1.17.4")
-      add_third_party_dependency("libpng-1.6.37")
-    endif()
+    add_third_party_dependency("pixman-0.44.2")
+    add_third_party_dependency("cairo-1.18.4")
+    add_third_party_dependency("libpng-1.6.47")
   else() #Linux
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("pixman-0.40.0")

cmake/importFreetype2.cmake

@@ -19,15 +19,11 @@ function(download_Freetype)
       add_third_party_dependency("harfbuzz-5.3.1")
     endif()
   elseif(OSX)
-    If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
-      add_third_party_dependency("freetype-2.12.1")
-      add_third_party_dependency("fontconfig-2.13.1")
-      add_third_party_dependency("harfbuzz-5.3.1")
-    else()
-      add_third_party_dependency("freetype-2.12.1")
-      add_third_party_dependency("fontconfig-2.13.1")
-      add_third_party_dependency("harfbuzz-5.3.1")
-    endif()
+    add_third_party_dependency("freetype-2.13.3")
+    add_third_party_dependency("fontconfig-2.16.0")
+    add_third_party_dependency("harfbuzz-11.0.0")
+    add_third_party_dependency("bzip2-1.0.9")
+    add_third_party_dependency("zlib-1.3.1")
   else() # linuxes, only for ARM
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("freetype-2.10.0")

cmake/importLibGit2.cmake

@@ -17,9 +17,7 @@ function(download_git2)
     add_third_party_dependency("zlib-1.2.13")
     add_third_party_dependency("ssh2-1.10.0")
   elseif(OSX)
-    add_third_party_dependency("libgit2-1.6.4")
-    add_third_party_dependency("openssl-1.1.1k")
-    add_third_party_dependency("libssh2-1.10.0")
+    add_third_party_dependency("libgit2-1.9.0")
   else() # LINUX
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("libgit2-1.4.4")

cmake/importSDL2.cmake

@@ -21,11 +21,7 @@ function(download_SDL2)
       add_third_party_dependency("SDL2-2.24.1")
     endif()
   elseif(OSX)
-    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
-      add_third_party_dependency("SDL2-2.30.6")
-    else()
-      add_third_party_dependency("SDL2-2.30.6")    
-    endif()
+    add_third_party_dependency("SDL2-2.32.2")    
   else() #LINUX
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("SDL2-2.0.14")
@@ -40,7 +36,7 @@ function(build_SDL2)
   	include(cmake/DownloadProject.cmake)
 	download_project(PROJ   SDL2
         GIT_REPOSITORY      https://github.com/pharo-project/SDL2.git
-        GIT_TAG             "v2.30.6"
+        GIT_TAG             "v2.32.2"
         ${UPDATE_DISCONNECTED_IF_AVAILABLE}
 	)
     add_subdirectory(${SDL2_SOURCE_DIR} ${SDL2_BINARY_DIR} EXCLUDE_FROM_ALL)

smalltalksrc/Melchor/MLLocalizationTestCase.class.st

@@ -158,7 +158,7 @@ MLLocalizationTestCase >> testAutoLocalizeVariableDoesNotLineariseUnnecessarySta
 
 	printedString := String streamContents: [ :str | (block asCASTIn: ccg) prettyPrintOn: str ].
 
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	nonInlinedMethodNotUsingAutolocalizedVariables(nonInlinedMethodNotUsingAutolocalizedVariables());
 }'
 ]
@@ -184,7 +184,7 @@ MLLocalizationTestCase >> testAutoLocalizeVariableExternalizesBeforeReturnRefere
 	printedString := String streamContents: [ :str | 
 		                 ((TStatementListNode statements: (interpretMethod statements last: 2)) asCASTIn: ccg) 
 			                 prettyPrintOn: str ].
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	local_autoLocalizedVariable += 1;
 	{
 		autoLocalizedVariable = local_autoLocalizedVariable;
@@ -240,14 +240,50 @@ MLLocalizationTestCase >> testAutoLocalizeVariableReplacesByLocalOnInline [
 	self assert: (variableNode isVariable and: [ variableNode name = #local_autoLocalizedVariable ]).
 ]
 
+{ #category : 'tests - localisation' }
+MLLocalizationTestCase >> testBytecodeUsingExternalizeAllVariables [
+
+	| interpretMethod cast printedString linearizedBlock |
+
+	MockLocalizationInterpreterMock initializeWithBytecodeUsingExternalizeAllVariables.	
+
+	interpretMethod := self applyLocalizationTo: #interpretWithSeveralVariablesToLocalize.
+
+	"Assert that the send node is preceded by variable externalization"
+	linearizedBlock := self linearizedBlockOfCaseMethod: interpretMethod.
+	cast := linearizedBlock asCASTIn: ccg.
+
+	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
+
+	"The if statement should not be wrapped. Only the inner statements"
+	self assert: printedString trimBoth equals:
+'{
+	{
+		autoLocalizedVariable = local_autoLocalizedVariable;
+		autoLocalizedVariable1 = local_autoLocalizedVariable1;
+		autoLocalizedVariable2 = local_autoLocalizedVariable2;
+		autoLocalizedVariable3 = local_autoLocalizedVariable3;
+		autoLocalizedVariable4 = local_autoLocalizedVariable4;
+		aMethodHavingExternalizeAllVariables();
+		local_autoLocalizedVariable = autoLocalizedVariable;
+		local_autoLocalizedVariable1 = autoLocalizedVariable1;
+		local_autoLocalizedVariable2 = autoLocalizedVariable2;
+		local_autoLocalizedVariable3 = autoLocalizedVariable3;
+		local_autoLocalizedVariable4 = autoLocalizedVariable4;
+	}
+}
+' trimBoth
+]
+
 { #category : 'tests - free variables' }
 MLLocalizationTestCase >> testCollectFreeVariablesOfMethodWithManyCallers [
 
 	| collector |
 	collector := SLCallGraphFreeVariableCollector codeGenerator: ccg.
+
 	ccg addClass: MockLocalizationInterpreterMock.
 	ccg prepareMethods.
-	
+
 	"
 	variableToLocalize should be considered free in the entire transitive call graph.
 
@@ -259,10 +295,17 @@ MLLocalizationTestCase >> testCollectFreeVariablesOfMethodWithManyCallers [
 	"
 	collector startFromSelector: #methodWithDiamond.
 
-	self assert: ((collector freeVariablesUsedByMethodNamed: #bytecodeUsingLocalizedVariable) includes: #variableToLocalize).	
-	self assert: ((collector freeVariablesUsedByMethodNamed: #methodCallingBytecodeUsingLocalizedVariable) includes: #variableToLocalize).
-	self assert: ((collector freeVariablesUsedByMethodNamed: #methodCallingBytecodeUsingLocalizedVariable2) includes: #variableToLocalize).
-	self assert: ((collector freeVariablesUsedByMethodNamed: #methodWithDiamond) includes: #variableToLocalize).
+	self assert: ((collector freeVariablesUsedByMethodNamed:
+			  #bytecodeUsingLocalizedVariable) includes: #variableToLocalize).
+	self assert: ((collector freeVariablesUsedByMethodNamed:
+			  #methodCallingBytecodeUsingLocalizedVariable) includes:
+			 #variableToLocalize).
+	self assert: ((collector freeVariablesUsedByMethodNamed:
+			  #methodCallingBytecodeUsingLocalizedVariable2) includes:
+			 #variableToLocalize).
+	self assert:
+		((collector freeVariablesUsedByMethodNamed: #methodWithDiamond)
+			 includes: #variableToLocalize)
 ]
 
 { #category : 'tests - localisation' }
@@ -277,7 +320,7 @@ MLLocalizationTestCase >> testExternalEscapingAsArgument [
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals:
+	self assert: printedString trimBoth equals:
 '{
 	sqInt t0;
 
@@ -303,7 +346,7 @@ MLLocalizationTestCase >> testExternalEscapingAsArgumentOfExternalCall [
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	sqInt t0;
 
 	{
@@ -335,7 +378,7 @@ MLLocalizationTestCase >> testExternalEscapingSendNodeInInlinedMethod [
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	autoLocalizedVariable = local_autoLocalizedVariable;
 	autoLocalizedVariable1 = local_autoLocalizedVariable1;
 	foo2();
@@ -357,7 +400,7 @@ MLLocalizationTestCase >> testExternalEscapingSendNodeShouldBeTranslatedWithExte
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	local_autoLocalizedVariable += 1;
 	{
 		autoLocalizedVariable = local_autoLocalizedVariable;
@@ -380,7 +423,7 @@ MLLocalizationTestCase >> testExternalEscapingStatementInConditionalBody [
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
 	"The if statement should not be wrapped. Only the inner statements"
-	self assert: printedString equals:
+	self assert: printedString trimBoth equals:
 '{
 	if (1) {
 		sqInt t0;
@@ -411,7 +454,7 @@ MLLocalizationTestCase >> testExternalPerform [
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals:
+	self assert: printedString trimBoth trimBoth equals:
 '{
 	{
 		autoLocalizedVariable = local_autoLocalizedVariable;
@@ -433,7 +476,7 @@ MLLocalizationTestCase >> testExternalSendNodeExternalizeAndInternalizeOnlyNeede
 	cast := linearizedBlock asCASTIn: ccg.
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	local_autoLocalizedVariable += 1;
 	{
 		autoLocalizedVariable = local_autoLocalizedVariable;
@@ -460,7 +503,7 @@ MLLocalizationTestCase >> testExternalSendNodeShouldBeTranslatedWithExternalizat
 	cast := linearizedBlock asCASTIn: ccg.
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	sqInt t0;
 
 	{
@@ -499,8 +542,8 @@ MLLocalizationTestCase >> testLinearizeAndInsideValueIf [
 				t0
 					ifTrue: [ t0 := self condition ]
 					ifFalse: [ t0 := t0 ] ].
-		overflow := t0.
-		^ overflow'.
+		_overflow := t0.
+		^ _overflow'.
 ]
 
 { #category : 'tests - linearization' }
@@ -532,8 +575,8 @@ MLLocalizationTestCase >> testLinearizeAndInsideValueIfNestedTwice [
 						t0
 							ifTrue: [ t0 := self condition ]
 							ifFalse: [ t0 := t0 ] ] ].
-		overflow := t0.
-		^ overflow'.
+		_overflow := t0.
+		^ _overflow'.
 ]
 
 { #category : 'tests - linearization' }
@@ -640,7 +683,7 @@ MLLocalizationTestCase >> testLinearizeNestedCallsWithAssignment [
 					arguments: { TVariableNode named: 't0' }))).
 	self assert: (replacementBlock statements third
 			isSameAs: (TAssignmentNode
-				variableNamed: 'foo'
+				variableNamed: '_foo'
 				expression: (TVariableNode named: 't1')))
 ]
 
@@ -728,8 +771,8 @@ MLLocalizationTestCase >> testLinearizeReceiverOfConditionalAndAssigned [
 	self assert: replacementBlock isRewrittenAs: '
 		t0 := self nonInlinedMethodUsingAutolocalizedVariable.
 		t0 ifTrue: [ t1 := self nonInlinedMethodUsingAutolocalizedVariable ] ifFalse: [ t1 := t0 ].
-		var := t1.
-		var ifTrue: [nil]'.
+		_var := t1.
+		_var ifTrue: [nil]'.
 ]
 
 { #category : 'tests - linearization' }
@@ -883,7 +926,7 @@ MLLocalizationTestCase >> testNoExternalSendNodeOnSafeExternalCall [
 
 	printedString := String streamContents: [ :str | cast prettyPrintOn: str ].
 
-	self assert: printedString equals: '{
+	self assert: printedString trimBoth equals: '{
 	nonInlinedMethodNotUsingAutolocalizedVariables((local_autoLocalizedVariable += 1));
 }'
 ]

smalltalksrc/Melchor/MockLocalizationInterpreterMock.class.st

@@ -42,6 +42,16 @@ MockLocalizationInterpreterMock class >> initializeWithAutoLocalizedVariableOnly
 	)
 ]
 
+{ #category : 'initialization' }
+MockLocalizationInterpreterMock class >> initializeWithBytecodeUsingExternalizeAllVariables [
+
+	BytecodeTable := Array new: 1.
+	self table: BytecodeTable from:
+	#(
+	(  0  bytecodeUsingExternalizeAllVariables)
+	)
+]
+
 { #category : 'initialization' }
 MockLocalizationInterpreterMock class >> initializeWithEscapingCall [
 
@@ -152,6 +162,13 @@ MockLocalizationInterpreterMock class >> initializeWithoutAutoLocalizedVariable
 	)
 ]
 
+{ #category : 'interpreter shell' }
+MockLocalizationInterpreterMock >> aMethodHavingExternalizeAllVariables [
+
+	<inline: false>
+	<externalizeAllVariables>
+]
+
 { #category : 'interpreter shell' }
 MockLocalizationInterpreterMock >> bytecodeInliningSharedMethod [
 
@@ -183,6 +200,12 @@ MockLocalizationInterpreterMock >> bytecodeUsingComplexAssert [
 	self assert: (self foo or: [ self bar and: [ self fum ] ])
 ]
 
+{ #category : 'interpreter shell' }
+MockLocalizationInterpreterMock >> bytecodeUsingExternalizeAllVariables [
+
+	self aMethodHavingExternalizeAllVariables
+]
+
 { #category : 'interpreter shell' }
 MockLocalizationInterpreterMock >> bytecodeUsingExternalizedAutoLocalizedVariable [
 

smalltalksrc/Melchor/VMClass.class.st

@@ -702,6 +702,14 @@ VMClass >> logDebug: aFormat _: aParameter [
 	(aFormat printf: { aParameter }) traceCr
 ]
 
+{ #category : 'logging' }
+VMClass >> logDebug: aFormat _: aParameter _:anotherParam [
+
+	<doNotGenerate>
+
+	(aFormat printf: { aParameter. anotherParam }) traceCr
+]
+
 { #category : 'debug support' }
 VMClass >> logError: aMessage [
 

smalltalksrc/Melchor/VMObjectIndices.class.st

@@ -74,6 +74,7 @@ Class {
 		'SelectorCannotReturn',
 		'SelectorCounterTripped',
 		'SelectorDoesNotUnderstand',
+		'SelectorInvalidFFICall',
 		'SelectorMustBeBoolean',
 		'SelectorRunWithIn',
 		'SelectorSistaTrap',

smalltalksrc/Slang/CCodeGenerator.class.st

@@ -5274,7 +5274,8 @@ CCodeGenerator >> validateLocalizationOfGlobals: varList exceptMethod: methodNam
 			methodFreeVariables := meth freeVariableReferences asSet.
 			 localizationCandidates do: [ :candidate | 
 				(methodFreeVariables includes: candidate)
-					ifTrue: [ variablesInConflict add: candidate ] ] ] ].
+					ifTrue: [ 
+						variablesInConflict add: candidate ] ] ] ].
 
 	variablesInConflict ifNotEmpty: [ | errorMessage |
 		errorMessage := String streamContents: [ :stream |

smalltalksrc/Slang/SLAutomaticLocalization.class.st

@@ -76,9 +76,12 @@ SLAutomaticLocalization >> autoLocalizationOfVariablesIn: aSelector withVariable
 	(replacementList isNil or: [ replacementList isEmpty ]) ifTrue: [ ^ self ].
 
 	codeGenerator currentMethod: m.
-
+	
 	replacementDict := (replacementList collect: [ :asso | 
 				 asso key -> (TVariableNode named: asso value) ]) asDictionary.
+
+	callgraphVariableCollector candidateVariables: replacementDict keys.
+
 	"Replace all localized variables by their localized versions"
 	m parseTree
 		bindVariablesIn: replacementDict.
@@ -107,6 +110,7 @@ SLAutomaticLocalization >> codeGenerator: anObject [
 
 	codeGenerator := anObject.
 	callgraphVariableCollector := SLCallGraphFreeVariableCollector codeGenerator: codeGenerator
+
 ]
 
 { #category : 'applying' }