Merge branch 'bugfix/esp32s2_o2_op' into 'master'

igrr · igrr · commit 600665a5638b · 2020-08-05T22:03:00.000+08:00
freertos: fix build error at -O2 optimization level

Closes IDFGH-3581

See merge request espressif/esp-idf!9444
diff --git a/components/freertos/tasks.c b/components/freertos/tasks.c
@@ -645,10 +645,11 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
 */
 void taskYIELD_OTHER_CORE( BaseType_t xCoreID, UBaseType_t uxPriority )
 {
-	TCB_t *curTCB = pxCurrentTCB[xCoreID];
+	TCB_t *curTCB;
 	BaseType_t i;
 
 	if (xCoreID != tskNO_AFFINITY) {
+		curTCB = pxCurrentTCB[xCoreID];
 		if ( curTCB->uxPriority < uxPriority ) {	// NOLINT(clang-analyzer-core.NullDereference) IDF-685
 			vPortYieldOtherCore( xCoreID );
 		}
diff --git a/tools/test_apps/system/startup/sdkconfig.ci.opt_o2 b/tools/test_apps/system/startup/sdkconfig.ci.opt_o2
@@ -0,0 +1 @@
+CONFIG_COMPILER_OPTIMIZATION_PERF=y

Original file line number	Diff line number	Diff line change
`@@ -645,10 +645,11 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode`
`645`	`645`	`*/`
`646`	`646`	`void taskYIELD_OTHER_CORE( BaseType_t xCoreID, UBaseType_t uxPriority )`
`647`	`647`	`{`
`648`		`- TCB_t *curTCB = pxCurrentTCB[xCoreID];`
	`648`	`+ TCB_t *curTCB;`
`649`	`649`	`BaseType_t i;`
`650`	`650`
`651`	`651`	`if (xCoreID != tskNO_AFFINITY) {`
	`652`	`+ curTCB = pxCurrentTCB[xCoreID];`
`652`	`653`	`if ( curTCB->uxPriority < uxPriority ) { // NOLINT(clang-analyzer-core.NullDereference) IDF-685`
`653`	`654`	`vPortYieldOtherCore( xCoreID );`
`654`	`655`	`}`