Merge branch 'main' into workflow/coverage/update

Author: owen-mc

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll

@@ -1844,9 +1844,6 @@ class TranslatedAssignExpr extends TranslatedNonConstantExpr {
     child = this.getRightOperand() and
     result = this.getLeftOperand().getFirstInstruction(kind)
     or
-    child = this.getRightOperand() and
-    result = this.getLeftOperand().getFirstInstruction(kind)
-    or
     kind instanceof GotoEdge and
     child = this.getLeftOperand() and
     result = this.getInstruction(AssignmentStoreTag())

go/extractor/autobuilder/autobuilder.go

@@ -54,13 +54,15 @@ func checkExtractorRun() bool {
 }
 
 // tryBuildIfExists tries to run the command `cmd args...` if the file `buildFile` exists and is not
-// a directory. Returns true if the command was successful and false if not.
-func tryBuildIfExists(buildFile, cmd string, args ...string) bool {
-	if util.FileExists(buildFile) {
+// a directory. Returns values indicating whether the script succeeded as well as whether the script was found.
+func tryBuildIfExists(buildFile, cmd string, args ...string) (scriptSuccess bool, scriptFound bool) {
+	scriptSuccess = false
+	scriptFound = util.FileExists(buildFile)
+	if scriptFound {
 		log.Printf("%s found.\n", buildFile)
-		return tryBuild(cmd, args...)
+		scriptSuccess = tryBuild(cmd, args...)
 	}
-	return false
+	return
 }
 
 // tryBuild tries to run `cmd args...`, returning true if successful and false if not.
@@ -92,11 +94,25 @@ var BuildScripts = []BuildScript{
 // Autobuild attempts to detect build systems based on the presence of build scripts from the
 // list in `BuildScripts` and run the corresponding command. This may invoke zero or more
 // build scripts in the order given by `BuildScripts`.
-func Autobuild() bool {
+// Returns `scriptSuccess` which indicates whether a build script was successfully executed.
+// Returns `scriptsExecuted` which contains the names of all build scripts that were executed.
+func Autobuild() (scriptSuccess bool, scriptsExecuted []string) {
+	scriptSuccess = false
+	scriptsExecuted = []string{}
+
 	for _, script := range BuildScripts {
-		if tryBuildIfExists(script.Filename, script.Tool) {
-			return true
+		// Try to run the build script
+		success, scriptFound := tryBuildIfExists(script.Filename, script.Tool)
+
+		// If it was found, we attempted to run it: add it to the array.
+		if scriptFound {
+			scriptsExecuted = append(scriptsExecuted, script.Filename)
+		}
+		// If it was successfully executed, we stop here.
+		if success {
+			scriptSuccess = true
+			return
 		}
 	}
-	return false
+	return
 }

go/extractor/cli/go-autobuilder/go-autobuilder.go

@@ -320,21 +320,26 @@ func setGopath(root string) {
 	log.Printf("GOPATH set to %s.\n", newGopath)
 }
 
-// Try to build the project without custom commands. If that fails, return a boolean indicating
-// that we should install dependencies ourselves.
+// Try to build the project with a build script. If that fails, return a boolean indicating
+// that we should install dependencies in the normal way.
 func buildWithoutCustomCommands(modMode project.ModMode) bool {
 	shouldInstallDependencies := false
-	// try to build the project
-	buildSucceeded := autobuilder.Autobuild()
-
-	// Build failed or there are still dependency errors; we'll try to install dependencies
-	// ourselves
-	if !buildSucceeded {
-		log.Println("Build failed, continuing to install dependencies.")
+	// try to run a build script
+	scriptSucceeded, scriptsExecuted := autobuilder.Autobuild()
+	scriptCount := len(scriptsExecuted)
+
+	// If there is no build script we could invoke successfully or there are still dependency errors;
+	// we'll try to install dependencies ourselves in the normal Go way.
+	if !scriptSucceeded {
+		if scriptCount > 0 {
+			log.Printf("Unsuccessfully ran %d build scripts(s), continuing to install dependencies in the normal way.\n", scriptCount)
+		} else {
+			log.Println("Unable to find any build scripts, continuing to install dependencies in the normal way.")
+		}
 
 		shouldInstallDependencies = true
 	} else if toolchain.DepErrors("./...", modMode.ArgsForGoVersion(toolchain.GetEnvGoSemVer())...) {
-		log.Println("Dependencies are still not resolving after the build, continuing to install dependencies.")
+		log.Printf("Dependencies are still not resolving after executing %d build script(s), continuing to install dependencies in the normal way.\n", scriptCount)
 
 		shouldInstallDependencies = true
 	}

go/extractor/cli/go-build-runner/go-build-runner.go

@@ -1,20 +1,22 @@
 package main
 
 import (
-	"github.com/github/codeql-go/extractor/util"
 	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 
+	"github.com/github/codeql-go/extractor/util"
+
 	"github.com/github/codeql-go/extractor/autobuilder"
 )
 
 func main() {
 	// check if a build command has successfully extracted something
 	autobuilder.CheckExtracted = true
-	if autobuilder.Autobuild() {
+	scriptSuccess, _ := autobuilder.Autobuild()
+	if scriptSuccess {
 		return
 	}
 

go/integration-tests-lib/go_integration_test.py

@@ -1,15 +1,22 @@
 import os
 from create_database_utils import *
 from diagnostics_test_utils import *
+from resolve_environment_utils import *
 
-def go_integration_test(source = "src", db = "db", runFunction = runSuccessfully):
+def go_integration_test(toolchain=None, source = "src", db = "db", runFunction = runSuccessfully):
   # Set up a GOPATH relative to this test's root directory;
   # we set os.environ instead of using extra_env because we
   # need it to be set for the call to "go clean -modcache" later
   goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
   os.environ['GOPATH'] = goPath
 
+  extra_env = None
+
+  if toolchain != None:
+    extra_env = { 'GOTOOLCHAIN': toolchain }
+
   try:
+    run_codeql_resolve_build_environment(lang="go", source=source, extra_env=extra_env)
     run_codeql_database_create([], lang="go", source=source, db=db, runFunction=runFunction)
 
     check_diagnostics()

go/ql/integration-tests/all-platforms/go/bazel-sample-1/build-environment.expected

@@ -0,0 +1,5 @@
+{
+  "configuration" : {
+    "go" : { }
+  }
+}

go/ql/integration-tests/all-platforms/go/bazel-sample-2/build-environment.expected

@@ -0,0 +1,5 @@
+{
+  "configuration" : {
+    "go" : { }
+  }
+}

go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build-environment.expected

@@ -0,0 +1,5 @@
+{
+  "configuration" : {
+    "go" : { }
+  }
+}

go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build-environment.expected

@@ -0,0 +1,5 @@
+{
+  "configuration" : {
+    "go" : { }
+  }
+}

go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build-environment.expected

@@ -0,0 +1,5 @@
+{
+  "configuration" : {
+    "go" : { }
+  }
+}