1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 23:03:53 -04:00

Fix gcc 12 warnings

This commit is contained in:
Eelco Dolstra 2024-02-28 22:59:20 +01:00
parent 90ec015d61
commit 65bb12ba78
5 changed files with 11 additions and 1 deletions

View file

@ -123,6 +123,11 @@ struct KeyedBuildResult : BuildResult
* The derivation we built or the store path we substituted. * The derivation we built or the store path we substituted.
*/ */
DerivedPath path; DerivedPath path;
// Hack to work around a gcc "may be used uninitialized" warning.
KeyedBuildResult(BuildResult res, DerivedPath path)
: BuildResult(std::move(res)), path(std::move(path))
{ }
}; };
} }

View file

@ -2480,6 +2480,7 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()
CanonPath { tmpDir + "/tmp" }).hash; CanonPath { tmpDir + "/tmp" }).hash;
} }
} }
assert(false);
}(); }();
ValidPathInfo newInfo0 { ValidPathInfo newInfo0 {

View file

@ -415,6 +415,8 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
// Use NAR; Git is not a serialization method // Use NAR; Git is not a serialization method
dumpMethod = FileSerialisationMethod::Recursive; dumpMethod = FileSerialisationMethod::Recursive;
break; break;
default:
assert(false);
} }
// TODO these two steps are essentially RemoteStore::addCAToStore. Move it up to Store. // TODO these two steps are essentially RemoteStore::addCAToStore. Move it up to Store.
auto path = store->addToStoreFromDump(source, name, dumpMethod, contentAddressMethod, hashAlgo, refs, repair); auto path = store->addToStoreFromDump(source, name, dumpMethod, contentAddressMethod, hashAlgo, refs, repair);

View file

@ -527,6 +527,8 @@ StorePath RemoteStore::addToStoreFromDump(
// Use NAR; Git is not a serialization method // Use NAR; Git is not a serialization method
fsm = FileSerialisationMethod::Recursive; fsm = FileSerialisationMethod::Recursive;
break; break;
default:
assert(false);
} }
if (fsm != dumpMethod) if (fsm != dumpMethod)
unsupported("RemoteStore::addToStoreFromDump doesn't support this `dumpMethod` `hashMethod` combination"); unsupported("RemoteStore::addToStoreFromDump doesn't support this `dumpMethod` `hashMethod` combination");

View file

@ -123,7 +123,7 @@ Hash hashPath(
case FileIngestionMethod::Git: case FileIngestionMethod::Git:
return git::dumpHash(ht, accessor, path, filter).hash; return git::dumpHash(ht, accessor, path, filter).hash;
} }
assert(false);
} }
} }