Merge branch 'real-master'

expression/bench_test.go

@@ -693,6 +693,8 @@ type vecExprBenchCase struct {
 	// geners[gen1, gen2] will be regarded as geners[gen1, gen2, nil].
 	// This field is optional.
 	geners []dataGenerator
+	// aesModeAttr information, needed by encryption functions
+	aesModes string
 	// constants are used to generate constant data for children[i].
 	constants []*Constant
 }